Update system test for online app updateDomain (#1160)

jshum2479 · web-flow · commit d3f04ade06d7 · 2022-08-26T13:23:29.000-05:00
* Update system test for online updating app and refactor applications_deployer

* update system test for online application update and refactor applications_deployer
diff --git a/core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py b/core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py
@@ -620,10 +620,15 @@ def __shouldCheckForTargetChange(self, src_path, model_src_path):
         # or if the model sourcepath + domain home is exactly equal to the running's app source path.
         # return True otherwise return False
         if not os.path.isabs(model_src_path):
-            return self.model_context.get_domain_home() + '/' + model_src_path == src_path
+            return FileUtils.getCanonicalPath(self.model_context.get_domain_home() + '/' + model_src_path) == src_path
         else:
             return FileUtils.getCanonicalPath(src_path) == FileUtils.getCanonicalPath(model_src_path)
 
+    def __append_to_stop_and_undeploy_apps(self, versioned_name, stop_and_undeploy_app_list, existing_targets_set):
+        if versioned_name not in stop_and_undeploy_app_list and len(existing_targets_set) > 0:
+            stop_and_undeploy_app_list.append(versioned_name)
+
+
     def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, stop_and_undeploy_app_list):
         """
         Update maps and lists to control re-deployment processing.
@@ -684,26 +689,24 @@ def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, s
 
                     existing_src_hash = self.__get_file_hash(src_path)
                     existing_plan_hash = self.__get_file_hash(plan_path)
+                    existing_app_targets = dictionary_utils.get_element(existing_app_ref, 'target')
+                    existing_app_targets_set = Set(existing_app_targets)
                     if model_src_hash == existing_src_hash:
                         if model_plan_hash == existing_plan_hash:
                             if self.__shouldCheckForTargetChange(src_path, model_src_path):
-
                                 # If model hashes match existing hashes, the application did not change.
                                 # Unless targets were added, there's no need to redeploy.
                                 # If it is an absolute path, there is nothing to compare so assume redeploy
                                 model_targets = dictionary_utils.get_element(app_dict, TARGET)
                                 model_targets_list = alias_utils.create_list(model_targets, 'WLSDPLY-08000')
                                 model_targets_set = Set(model_targets_list)
 
-                                existing_app_targets = dictionary_utils.get_element(existing_app_ref, 'target')
-                                existing_app_targets_set = Set(existing_app_targets)
-
                                 if existing_app_targets_set == model_targets_set and len(existing_app_targets_set) > 0:
                                     # redeploy the app if everything is the same
                                     self.logger.info('WLSDPLY-09336', src_path,
                                                      class_name=self._class_name, method_name=_method_name)
-                                    if versioned_name not in stop_and_undeploy_app_list:
-                                        stop_and_undeploy_app_list.append(versioned_name)
+                                    self.__append_to_stop_and_undeploy_apps(versioned_name, stop_and_undeploy_app_list
+                                                                            , existing_app_targets_set)
                                 elif len(existing_app_targets_set) == 0 and len(model_targets_set) == 0:
                                     self.__remove_app_from_deployment(model_apps, app, "emptyset")
                                 elif existing_app_targets_set.issuperset(model_targets_set):
@@ -721,16 +724,16 @@ def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, s
                                         app_dict['SourcePath'] = src_path
                             else:
                                 # same hash but different path, so redeploy it
-                                if versioned_name not in stop_and_undeploy_app_list:
-                                    stop_and_undeploy_app_list.append(versioned_name)
+                                self.__append_to_stop_and_undeploy_apps(versioned_name, stop_and_undeploy_app_list
+                                                                        , existing_app_targets_set)
                         else:
                             # updated deployment plan
-                            if versioned_name not in stop_and_undeploy_app_list:
-                                stop_and_undeploy_app_list.append(versioned_name)
+                            self.__append_to_stop_and_undeploy_apps(versioned_name, stop_and_undeploy_app_list
+                                                                    , existing_app_targets_set)
                     else:
                         # updated app
-                        if versioned_name not in stop_and_undeploy_app_list:
-                            stop_and_undeploy_app_list.append(versioned_name)
+                        self.__append_to_stop_and_undeploy_apps(versioned_name, stop_and_undeploy_app_list
+                                                                , existing_app_targets_set)
 
     def __remove_delete_targets(self, model_dict, existing_ref):
         """
diff --git a/system-test/src/test/java/oracle/weblogic/deploy/integration/BaseTest.java b/system-test/src/test/java/oracle/weblogic/deploy/integration/BaseTest.java
@@ -28,6 +28,7 @@ public class BaseTest {
     private static final PlatformLogger logger = WLSDeployLogFactory.getLogger("integration.tests");
     protected static final String FS = File.separator;
     private static final String SAMPLE_ARCHIVE_FILE = "archive.zip";
+    private static final String UPDATED_SAMPLE_ARCHIVE_FILE = "archive2.zip";
     private static final String WDT_ZIPFILE = "weblogic-deploy.zip";
     private static final String WDT_HOME_DIR = "weblogic-deploy";
     protected static final String SAMPLE_MODEL_FILE_PREFIX = "simple-topology";
@@ -195,10 +196,20 @@ protected static CommandResult buildSampleArchive() throws Exception {
         return executeAndVerify(command);
     }
 
+    protected static CommandResult updateSampleArchive() throws Exception {
+        logger.info("Update WDT archive ...");
+        String command = "sh " + getResourcePath() + FS + "update-archive.sh";
+        return executeAndVerify(command);
+    }
+
     protected static String getSampleArchiveFile() {
         return getGeneratedResourcePath() + FS + SAMPLE_ARCHIVE_FILE;
     }
 
+    protected static String getUpdatedSampleArchiveFile() {
+        return getGeneratedResourcePath() + FS + UPDATED_SAMPLE_ARCHIVE_FILE;
+    }
+
     protected static String getSampleModelFile(String suffix) {
         return getResourcePath() + FS + SAMPLE_MODEL_FILE_PREFIX + suffix + ".yaml";
     }
diff --git a/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java b/system-test/src/test/java/oracle/weblogic/deploy/integration/ITWdt.java
@@ -824,6 +824,111 @@ void test29EncryptModel(TestInfo testInfo) throws Exception {
         }
     }
 
+    /**
+     * test updateDomain.sh online with untargeting, deploy, and app update
+     * @throws Exception - if any error occurs
+     */
+    @DisplayName("Test 30: createDomain and run updateDomain online for application")
+    @Order(30)
+    @Tag("gate")
+    @Test
+    void test30OnlineUpdateApp(TestInfo testInfo) throws Exception {
+        String domainDir = "domain2";
+        String cmd = createDomainScript
+            + " -oracle_home " + mwhome_12213
+            + " -domain_home " + domainParentDir + FS + domainDir
+            + " -model_file " + getSampleModelFile("-onlinebase")
+            + " -archive_file " + getSampleArchiveFile();
+
+        try (PrintWriter out = getTestMethodWriter(testInfo)) {
+            CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+            assertEquals(0, result.exitValue(), "Unexpected return code");
+            assertTrue(result.stdout().contains("createDomain.sh completed successfully"), "Create failed");
+        }
+
+        String domainHome = domainParentDir + FS + domainDir;
+        setUpBootProperties(domainHome, "admin-server", "weblogic", "welcome1");
+        Path adminServerOut = getTestOutputPath(testInfo).resolve("admin-server.out");
+        boolean isServerUp = startAdminServer(domainHome, adminServerOut);
+
+        if (isServerUp) {
+            try (PrintWriter out = getTestMethodWriter(testInfo)) {
+                // update wdt model file
+                Path source = Paths.get(getSampleModelFile("-untargetapp"));
+                Path model = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "-onlineUpdate.yaml");
+                Files.copy(source, model, StandardCopyOption.REPLACE_EXISTING);
+
+                cmd = "echo welcome1 | "
+                    + updateDomainScript
+                    + " -oracle_home " + mwhome_12213
+                    + " -domain_home " + domainParentDir + FS + domainDir
+                    + " -model_file " + model
+                    + " -archive_file " + getSampleArchiveFile()
+                    + " -admin_url t3://localhost:7001 -admin_user weblogic";
+                CommandResult result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+
+                assertEquals(0, result.exitValue(), "Unexpected return code for untargeting app");
+                assertTrue(result.stdout().contains("<remove_app_from_deployment> <WLSDPLY-09339>"),
+                    "Update does not contains expected message WLSDPLY-09339");
+
+                // Check result
+                source = Paths.get(getSampleModelFile("-targetapp"));
+                model = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "-onlineUpdate.yaml");
+                Files.copy(source, model, StandardCopyOption.REPLACE_EXISTING);
+
+                cmd = "echo welcome1 | "
+                    + updateDomainScript
+                    + " -oracle_home " + mwhome_12213
+                    + " -domain_home " + domainParentDir + FS + domainDir
+                    + " -model_file " + model
+                    + " -archive_file " + getSampleArchiveFile()
+                    + " -admin_url t3://localhost:7001 -admin_user weblogic";
+                result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+
+                assertEquals(0, result.exitValue(), "Unexpected return code for targeting app");
+                assertTrue(result.stdout().contains("<__deploy_app_online> <WLSDPLY-09316>"),
+                    "Update does not contains expected message WLSDPLY-09316");
+                assertTrue(result.stdout().contains("<__start_app> <WLSDPLY-09313>"),
+                    "Update does not contains expected message WLSDPLY-09313");
+
+                updateSampleArchive();
+
+                source = Paths.get(getSampleModelFile("-targetapp"));
+                model = getTestOutputPath(testInfo).resolve(SAMPLE_MODEL_FILE_PREFIX + "-onlineUpdate.yaml");
+                Files.copy(source, model, StandardCopyOption.REPLACE_EXISTING);
+
+                cmd = "echo welcome1 | "
+                    + updateDomainScript
+                    + " -oracle_home " + mwhome_12213
+                    + " -domain_home " + domainParentDir + FS + domainDir
+                    + " -model_file " + model
+                    + " -archive_file " + getUpdatedSampleArchiveFile()
+                    + " -admin_url t3://localhost:7001 -admin_user weblogic";
+                result = Runner.run(cmd, getTestMethodEnvironment(testInfo), out);
+
+                assertEquals(0, result.exitValue(), "Unexpected return code for updating domain with new archive");
+                assertTrue(result.stdout().contains("<__stop_app> <WLSDPLY-09312>"),
+                    "Update does not contains expected message WLSDPLY-09312");
+                assertTrue(result.stdout().contains("<__undeploy_app> <WLSDPLY-09314>"),
+                    "Update does not contains expected message WLSDPLY-09314");
+                assertTrue(result.stdout().contains("<__deploy_app_online> <WLSDPLY-09316>"),
+                    "Update does not contains expected message WLSDPLY-09316");
+                assertTrue(result.stdout().contains("<__start_app> <WLSDPLY-09313>"),
+                    "Update does not contains expected message WLSDPLY-09313");
+
+                stopAdminServer(domainHome);
+            }
+
+        } else {
+            // Best effort to clean up server
+            tryKillTheAdminServer(domainHome, "admin-server");
+            throw new Exception("testDOnlineUpdate failed - cannot bring up server");
+        }
+
+
+    }
+
+
     private boolean startAdminServer(String domainHome, Path outputFile) throws Exception {
         boolean isServerUp = false;
         String cmd = "nohup " + domainHome + "/bin/startWebLogic.sh > " + outputFile + " 2>&1 &";
diff --git a/system-test/src/test/resources/simple-topology-onlinebase.yaml b/system-test/src/test/resources/simple-topology-onlinebase.yaml
@@ -0,0 +1,33 @@
+domainInfo:
+  AdminUserName: weblogic
+  AdminPassword: welcome1
+  ServerStartMode: prod
+topology:
+  Name: domain2
+  AdminServerName: 'admin-server'
+  ProductionModeEnabled: true
+  Cluster:
+    'cluster1':
+      ClientCertProxyEnabled: true
+      FrontendHost: localhost
+      DynamicServers:
+        ServerTemplate: template1
+        CalculatedListenPorts: true
+        ServerNamePrefix: 'managed-server-'
+        DynamicClusterSize: 2
+        MaxDynamicClusterSize: 2
+  Server:
+    'admin-server':
+      ListenPort: 7001
+  ServerTemplate:
+    template1:
+      ListenPort: 8001
+appDeployments:
+  Application:
+    # Quote needed because of hyphen in string
+    'simple-app':
+      SourcePath: 'wlsdeploy/applications/simple-app.war'
+      Target: 'admin-server'
+      ModuleType: war
+      StagingMode: nostage
+      PlanStagingMode: nostage
diff --git a/system-test/src/test/resources/simple-topology-targetapp.yaml b/system-test/src/test/resources/simple-topology-targetapp.yaml
@@ -0,0 +1,6 @@
+appDeployments:
+  Application:
+    # Quote needed because of hyphen in string
+    'simple-app':
+      SourcePath: 'wlsdeploy/applications/simple-app.war'
+      Target: 'admin-server'
diff --git a/system-test/src/test/resources/simple-topology-untargetapp.yaml b/system-test/src/test/resources/simple-topology-untargetapp.yaml
@@ -0,0 +1,6 @@
+appDeployments:
+  Application:
+    # Quote needed because of hyphen in string
+    'simple-app':
+      SourcePath: 'wlsdeploy/applications/simple-app.war'
+      Target: '!admin-server'
diff --git a/system-test/src/test/resources/update-archive.sh b/system-test/src/test/resources/update-archive.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Copyright (c) 2022, Oracle and/or its affiliates.
+#
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+#
+set -e
+projectDir=$(pwd)
+archiveDir=${projectDir}/target/resources
+cd "$archiveDir"
+cp archive.zip archive2.zip
+mkdir temp
+cd temp
+jar xf ../archive2.zip
+touch dummy.html
+jar uf wlsdeploy/applications/simple-app.war dummy.html
+jar uf ../archive2.zip wlsdeploy/applications/simple-app.war
+
+
