Fix deletetarget and nontargetupdate (#1156)

Author: jshum2479

core/src/main/python/wlsdeploy/tool/deploy/applications_deployer.py

@@ -405,13 +405,6 @@ def __get_existing_apps(self, base_location):
                 absolute_planpath = attributes_map['AbsolutePlanPath']
                 config_targets = self.__get_config_targets()
 
-                # AppRuntimeStateRuntime/AppRuntimeStateRuntime always return the app even if not targeted
-                # skip as if it is not there
-                if len(config_targets) == 0:
-                    continue
-                # There are case in application where absolute source path is not set but sourepath is
-                # if source path is not absolute then we need to add the domain path
-
                 if absolute_planpath is None:
                     absolute_planpath = attributes_map['PlanPath']
 
@@ -607,6 +600,14 @@ def __build_library_deploy_strategy(self, location, model_libs, existing_lib_ref
                             if lib_dict['SourcePath'] is None and existing_src_path is not None:
                                 lib_dict['SourcePath'] = existing_src_path
 
+    def __shouldCheckForTargetChange(self, src_path, model_src_path):
+        # If the existing running app's source path (always absolute from runtime mbean) = the model's source 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
+        else:
+            return FileUtils.getCanonicalPath(src_path) == FileUtils.getCanonicalPath(model_src_path)
 
     def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, stop_and_undeploy_app_list):
         """
@@ -666,8 +667,8 @@ def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, s
                     existing_plan_hash = self.__get_file_hash(plan_path)
                     if model_src_hash == existing_src_hash:
                         if model_plan_hash == existing_plan_hash:
-                            if not (os.path.isabs(src_path) and os.path.isabs(model_src_path) and
-                                    FileUtils.getCanonicalPath(src_path) == FileUtils.getCanonicalPath(model_src_path)):
+                            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
@@ -678,8 +679,16 @@ def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, s
                                 existing_app_targets = dictionary_utils.get_element(existing_app_ref, 'target')
                                 existing_app_targets_set = Set(existing_app_targets)
 
-                                if existing_app_targets_set.issuperset(model_targets_set):
-                                    self.__remove_app_from_deployment(model_apps, app)
+                                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)
+                                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):
+                                    self.__remove_app_from_deployment(model_apps, app, "superset")
                                 else:
                                     # Adjust the targets to only the new targets so that existing apps on
                                     # already targeted servers are not impacted.
@@ -692,8 +701,7 @@ def __build_app_deploy_strategy(self, location, model_apps, existing_app_refs, s
                                     if app_dict['SourcePath'] is None and src_path is not None:
                                         app_dict['SourcePath'] = src_path
                             else:
-                                self.logger.info('WLSDPLY-09336', src_path,
-                                                 class_name=self._class_name, method_name=_method_name)
+                                # 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)
                         else:
@@ -833,9 +841,17 @@ def __handle_builtin_libraries(self, targets_not_changed, model_libs, lib,
             adjusted_targets = ','.join(adjusted_set)
             model_libs[lib][TARGET] = adjusted_targets
 
-    def __remove_app_from_deployment(self, model_dict, app_name):
-        self.logger.info('WLSDPLY-09337', app_name,
-                         class_name=self._class_name, method_name='remove_app_from_deployment')
+    def __remove_app_from_deployment(self, model_dict, app_name, reason="delete"):
+        if "superset" == reason:
+            self.logger.info('WLSDPLY-09338', app_name,
+                             class_name=self._class_name, method_name='remove_app_from_deployment')
+        elif "emptyset" == reason:
+            self.logger.info('WLSDPLY-09339', app_name,
+                             class_name=self._class_name, method_name='remove_app_from_deployment')
+        else:
+            self.logger.info('WLSDPLY-09337', app_name,
+                             class_name=self._class_name, method_name='remove_app_from_deployment')
+
         model_dict.pop(app_name)
 
     def __remove_lib_from_deployment(self, model_dict, lib_name):

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -1151,6 +1151,10 @@ WLSDPLY-09334=Application {0} not found. Please specify a valid application for
 WLSDPLY-09335=Undeploying {0} {1} from targets: {2}
 WLSDPLY-09336=Redeployed application {0} because the old and the new binary have the same path.
 WLSDPLY-09337=Removing {0} from model deployment because it is started with a delete notation. It will be undeployed.
+WLSDPLY-09338=Removing {0} from model deployment because the running application's targets are a superset of \
+  the targets in the model. 
+WLSDPLY-09339=Removing {0} from model deployment because the running application's has no target and \
+  also no targets in the model. 
 
 # wlsdeploy/tool/deploy/common_resources_deployer.py
 WLSDPLY-09400=ResourceGroup was specified in the test file but are not supported in WebLogic Server version {0}