Merge branch 'issue-1663-delete-now' into 'main'

Apply the delete_now flag to subfolders consistently

See merge request weblogic-cloud/weblogic-deploy-tooling!1835

Author: robertpatrick

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

@@ -51,22 +51,22 @@ def __init__(self, model, model_context, aliases, wlst_mode=WlstModes.OFFLINE):
         self._resources = self.model.get_model_resources()
 
     # Override
-    def _add_subfolders(self, model_nodes, location, excludes=None):
+    def _add_subfolders(self, model_nodes, location, excludes=None, delete_now=True):
         """
         Override the base method for sub-folders of self-tuning.
         The work manager sub-folder must be processed last.
         """
         parent_type = self.get_location_type(location)
         if parent_type == SELF_TUNING:
             # add all sub-folders except work manager
-            Deployer._add_subfolders(self, model_nodes, location, excludes=[WORK_MANAGER])
+            Deployer._add_subfolders(self, model_nodes, location, excludes=[WORK_MANAGER], delete_now=delete_now)
 
             # add the work manager sub-folder last
             watch_nodes = dictionary_utils.get_dictionary_element(model_nodes, WORK_MANAGER)
-            self._add_named_elements(WORK_MANAGER, watch_nodes, location)
+            self._add_named_elements(WORK_MANAGER, watch_nodes, location, delete_now=delete_now)
             return
 
-        Deployer._add_subfolders(self, model_nodes, location, excludes=excludes)
+        Deployer._add_subfolders(self, model_nodes, location, excludes=excludes, delete_now=delete_now)
 
     # Override
     def _create_and_cd(self, location, existing_names, child_nodes):

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2024, Oracle and/or its affiliates.
+Copyright (c) 2017, 2025, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 """
 from array import array
@@ -117,20 +117,21 @@ def _add_named_elements(self, type_name, model_nodes, location, delete_now=True)
 
             child_nodes = dictionary_utils.get_dictionary_element(model_nodes, name)
             self._create_and_cd(location, existing_names, child_nodes)
-            self._set_attributes_and_add_subfolders(location, child_nodes)
+            self._set_attributes_and_add_subfolders(location, child_nodes, delete_now=delete_now)
 
     #
     # This method exists purely to allow subclasses to override how an mbean is created.
     #
     def _create_and_cd(self, location, existing_names, child_nodes):
         deployer_utils.create_and_cd(location, existing_names, self.aliases)
 
-    def _add_subfolders(self, model_nodes, location, excludes=None):
+    def _add_subfolders(self, model_nodes, location, excludes=None, delete_now=True):
         """
         Add each model sub-folder from the specified nodes and set its attributes.
         :param model_nodes: the child nodes of a model element
         :param location: the location where sub-folders should be added
         :param excludes: optional list of sub-folder names to be excluded from processing
+        :param delete_now: Flag to determine if deletes are processed immediately or delayed
         """
         location = LocationContext(location)
         model_subfolder_names = self.aliases.get_model_subfolder_names(location)
@@ -142,16 +143,17 @@ def _add_subfolders(self, model_nodes, location, excludes=None):
                 if len(subfolder_nodes) != 0:
                     sub_location = LocationContext(location).append_location(subfolder)
                     if self.aliases.supports_multiple_mbean_instances(sub_location):
-                        self._add_named_elements(subfolder, subfolder_nodes, location)
+                        self._add_named_elements(subfolder, subfolder_nodes, location, delete_now=delete_now)
                     else:
-                        self._add_model_elements(subfolder, subfolder_nodes, location)
+                        self._add_model_elements(subfolder, subfolder_nodes, location, delete_now=delete_now)
 
-    def _add_model_elements(self, type_name, model_nodes, location):
+    def _add_model_elements(self, type_name, model_nodes, location, delete_now=True):
         """
         Add each model element from the specified nodes at the specified location and set its attributes.
+        :param type_name: the name of the model folder to add
         :param model_nodes: the child nodes of a model element
         :param location: the location where sub-folders should be added
-        :param type_name: the name of the model folder to add
+        :param delete_now: Flag to determine if deletes are processed immediately or delayed
         """
         _method_name = '_add_model_elements'
 
@@ -169,18 +171,19 @@ def _add_model_elements(self, type_name, model_nodes, location):
 
         deployer_utils.create_and_cd(location, existing_subfolder_names, self.aliases)
 
-        self._set_attributes_and_add_subfolders(location, model_nodes)
+        self._set_attributes_and_add_subfolders(location, model_nodes, delete_now=delete_now)
 
-    def _set_attributes_and_add_subfolders(self, location, model_nodes):
+    def _set_attributes_and_add_subfolders(self, location, model_nodes, delete_now=True):
         """
         Set the attributes and add sub-folders for the specified location.
         This method can be overridden for finer control of the ordering
         :param location: the location of the attributes and sub-folders
         :param model_nodes: a map of model nodes including attributes and sub-folders
+        :param delete_now: Flag to determine if deletes are processed immediately or delayed
         :raise: DeployException: if an error condition is encountered
         """
         self.set_attributes(location, model_nodes)
-        self._add_subfolders(model_nodes, location)
+        self._add_subfolders(model_nodes, location, delete_now=delete_now)
 
     def set_attributes(self, location, model_nodes, excludes=None):
         """

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

@@ -96,7 +96,7 @@ def _add_named_elements(self, type_name, model_nodes, location, delete_now=True)
         Deployer._add_named_elements(self, type_name, model_nodes, location, delete_now)
 
     # Override
-    def _add_model_elements(self, type_name, model_nodes, location):
+    def _add_model_elements(self, type_name, model_nodes, location, delete_now=True):
         """
         Override the base method for these special cases:
         1) JMS resources must be deployed in specific order.
@@ -106,7 +106,7 @@ def _add_model_elements(self, type_name, model_nodes, location):
             self._add_jms_resources(model_nodes, location)
             return
 
-        Deployer._add_model_elements(self, type_name, model_nodes, location)
+        Deployer._add_model_elements(self, type_name, model_nodes, location, delete_now=delete_now)
 
     def _add_jms_resources(self, resource_nodes, location):
         """

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

@@ -44,39 +44,41 @@ def add_multi_tenant_objects(self, location):
         self._add_partitions(location)
 
     # Override
-    def _add_subfolders(self, model_nodes, location, excludes=None):
+    def _add_subfolders(self, model_nodes, location, excludes=None, delete_now=True):
         """
         Override the base method for sub-folders of resource group and template.
         Those sub-folders must be processed in a specific order, some with special processing.
         :param model_nodes: the child nodes of a model element
         :param location: the location where sub-folders should be added
         :param excludes: optional list of sub-folder names to be excluded from processing
+        :param delete_now: Flag to determine if deletes are processed immediately or delayed
         """
         parent_type = self.get_location_type(location)
         is_in = (parent_type == RESOURCE_GROUP) or (parent_type == RESOURCE_GROUP_TEMPLATE)
         if is_in:
             self._add_resource_group_resources(model_nodes, location)
             return
 
-        Deployer._add_subfolders(self, model_nodes, location, excludes=excludes)
+        Deployer._add_subfolders(self, model_nodes, location, excludes=excludes, delete_now=delete_now)
 
     # Override
-    def _set_attributes_and_add_subfolders(self, location, model_nodes):
+    def _set_attributes_and_add_subfolders(self, location, model_nodes, delete_now=True):
         """
         Override the base method for attributes and sub-folders of partition.
         Process sub-folders first to allow attributes to reference partition work manager and resource manager.
         :param location: the location of the attributes and sub-folders
         :param model_nodes: a map of model nodes including attributes and sub-folders
+        :param delete_now: Flag to determine if deletes are processed immediately or delayed
         :raise: DeployException: if an error condition is encountered
         """
         parent_type = self.get_location_type(location)
         if parent_type == PARTITION:
-            self._add_subfolders(model_nodes, location)
+            self._add_subfolders(model_nodes, location, delete_now=delete_now)
             self.wlst_helper.cd(self.aliases.get_wlst_attributes_path(location))
             self.set_attributes(location, model_nodes)
             return
 
-        Deployer._set_attributes_and_add_subfolders(self, location, model_nodes)
+        Deployer._set_attributes_and_add_subfolders(self, location, model_nodes, delete_now=delete_now)
 
     def _add_partitions(self, location):
         partitions = dictionary_utils.get_dictionary_element(self._resources, PARTITION)

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

@@ -75,11 +75,11 @@ def _add_named_elements(self, type_name, model_nodes, location, delete_now=True)
         self._topology_helper.check_coherence_cluster_references(type_name, model_nodes)
         # continue with regular processing
 
-        Deployer._add_named_elements(self, type_name, model_nodes, location, delete_now)
+        Deployer._add_named_elements(self, type_name, model_nodes, location, delete_now=delete_now)
 
     # Override
-    def _add_model_elements(self, type_name, model_nodes, location):
-        Deployer._add_model_elements(self, type_name, model_nodes, location)
+    def _add_model_elements(self, type_name, model_nodes, location, delete_now=True):
+        Deployer._add_model_elements(self, type_name, model_nodes, location, delete_now=delete_now)
 
         # check for file paths that need to be qualified
         self._topology_helper.qualify_nm_properties(type_name, model_nodes, location, self.model_context,
@@ -237,9 +237,9 @@ def _process_section(self, folder_dict, folder_list, key, location, delete_now=T
             nodes = dictionary_utils.get_dictionary_element(folder_dict, key)
             sub_location = LocationContext(location).append_location(key)
             if self.aliases.supports_multiple_mbean_instances(sub_location):
-                self._add_named_elements(key, nodes, location, delete_now)
+                self._add_named_elements(key, nodes, location, delete_now=delete_now)
             else:
-                self._add_model_elements(key, nodes, location)
+                self._add_model_elements(key, nodes, location, delete_now=delete_now)
 
         if key in folder_list:
             folder_list.remove(key)

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

@@ -30,20 +30,20 @@ def add_wldf_modules(self, parent_dict, location):
         self._add_named_elements(WLDF_SYSTEM_RESOURCE, wldf_resources, location)
 
     # Override
-    def _add_subfolders(self, model_nodes, location, excludes=None):
+    def _add_subfolders(self, model_nodes, location, excludes=None, delete_now=True):
         """
         Override the base method for sub-folders of watch notification.
         The watch sub-folder must be processed last.
         """
         parent_type = self.get_location_type(location)
         if parent_type == WATCH_NOTIFICATION:
             # add all sub-folders except watch
-            Deployer._add_subfolders(self, model_nodes, location, excludes=[WATCH])
+            Deployer._add_subfolders(self, model_nodes, location, excludes=[WATCH], delete_now=delete_now)
 
             # add the watch sub-folder last
             watch_nodes = dictionary_utils.get_dictionary_element(model_nodes, WATCH)
-            self._add_named_elements(WATCH, watch_nodes, location)
+            self._add_named_elements(WATCH, watch_nodes, location, delete_now=delete_now)
             return
 
-        Deployer._add_subfolders(self, model_nodes, location, excludes=excludes)
+        Deployer._add_subfolders(self, model_nodes, location, excludes=excludes, delete_now=delete_now)
         return