Issue #343 Clear targeting of JDBC placeholders that were created

Author: rakillen

core/src/main/python/wlsdeploy/tool/create/domain_creator.py

@@ -738,7 +738,7 @@ def __create_clusters_and_servers(self, location):
 
         # create placeholders for JDBC resources that may be referenced in cluster definition.
         resources_dict = self.model.get_model_resources()
-        self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
+        jdbc_names = self.topology_helper.create_placeholder_jdbc_resources(resources_dict)
         cluster_nodes = dictionary_utils.get_dictionary_element(self._topology, CLUSTER)
         if len(cluster_nodes) > 0:
             self._create_named_mbeans(CLUSTER, cluster_nodes, location, log_created=True)
@@ -760,7 +760,7 @@ def __create_clusters_and_servers(self, location):
             self._create_named_mbeans(SERVER, server_nodes, location, log_created=True)
 
         # targets may have been inadvertently assigned when clusters were added
-        self.topology_helper.clear_jdbc_placeholder_targeting(resources_dict)
+        self.topology_helper.clear_jdbc_placeholder_targeting(jdbc_names)
 
         self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return

core/src/main/python/wlsdeploy/tool/util/topology_helper.py

@@ -93,8 +93,9 @@ def create_placeholder_jdbc_resources(self, resources):
         Create a placeholder JDBC resource for each name in the resources section.
         This is necessary because cluster attributes may reference JDBC resources.
         :param resources: the resource model nodes
+        :return: a list of names of created placeholders
         """
-        self.create_placeholder_named_elements(LocationContext(), JDBC_SYSTEM_RESOURCE, resources)
+        return self.create_placeholder_named_elements(LocationContext(), JDBC_SYSTEM_RESOURCE, resources)
 
     def create_placeholder_named_elements(self, location, model_type, model_nodes):
         """
@@ -103,8 +104,10 @@ def create_placeholder_named_elements(self, location, model_type, model_nodes):
         :param location: the location for the nodes to be added
         :param model_type: the type of the specified model nodes
         :param model_nodes: the model nodes
+        :return: a list of names of created placeholders
         """
         _method_name = 'create_placeholder_named_elements'
+        holder_names = []
         original_location = self.wlst_helper.get_pwd()
         resource_location = LocationContext(location).append_location(model_type)
 
@@ -125,8 +128,10 @@ def create_placeholder_named_elements(self, location, model_type, model_nodes):
                     resource_location.add_name_token(token, name)
                     deployer_utils.create_and_cd(resource_location, existing_names, self.alias_helper)
                     self._update_placeholder(model_type, name, resource_location)
+                    holder_names.append(name)
 
         self.wlst_helper.cd(original_location)
+        return holder_names
 
     def _update_placeholder(self, type_name, name, location):
         """
@@ -148,31 +153,25 @@ def _update_placeholder(self, type_name, name, location):
                     self.wlst_helper.set('Name', name)
                 self.wlst_helper.cd(original_location)
 
-    def clear_jdbc_placeholder_targeting(self, resources):
+    def clear_jdbc_placeholder_targeting(self, jdbc_names):
         """
-        Remove any targets for the JDBC resources in the specified dictionary.
+        Remove any targets for the JDBC resources in the specified list of names.
         Targets may have been inadvertently assigned when clusters were added after JDBC placeholders.
-        :param resources: dictionary containing the resources section of the model
+        :param jdbc_names: names of placeholders to clear
         """
         _method_name = 'clear_jdbc_placeholder_targeting'
         resource_location = LocationContext().append_location(JDBC_SYSTEM_RESOURCE)
         token = self.alias_helper.get_name_token(resource_location)
 
-        if self.alias_helper.get_wlst_mbean_type(resource_location) is not None:
-            name_nodes = dictionary_utils.get_dictionary_element(resources, JDBC_SYSTEM_RESOURCE)
-            for name in name_nodes.keys():
-                if model_helper.is_delete_name(name):
-                    # don't clear placeholder for delete names
-                    continue
-
-                self.logger.info('WLSDPLY-19404', JDBC_SYSTEM_RESOURCE, name, class_name=self.__class_name,
-                                 method_name=_method_name)
+        for name in jdbc_names:
+            self.logger.info('WLSDPLY-19404', JDBC_SYSTEM_RESOURCE, name, class_name=self.__class_name,
+                             method_name=_method_name)
 
-                resource_location.add_name_token(token, name)
-                wlst_path = self.alias_helper.get_wlst_attributes_path(resource_location)
-                if self.wlst_helper.path_exists(wlst_path):
-                    mbean = self.wlst_helper.get_mbean_for_wlst_path(wlst_path)
-                    mbean.setTargets(None)
+            resource_location.add_name_token(token, name)
+            wlst_path = self.alias_helper.get_wlst_attributes_path(resource_location)
+            if self.wlst_helper.path_exists(wlst_path):
+                mbean = self.wlst_helper.get_mbean_for_wlst_path(wlst_path)
+                mbean.setTargets(None)
 
     def qualify_nm_properties(self, type_name, model_nodes, base_location, model_context, attribute_setter):
         """