Issue #343 Clear targeting of JDBC resources after clusters are created

Author: rakillen

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

@@ -750,6 +750,9 @@ def __create_clusters_and_servers(self, location):
         if len(server_nodes) > 0:
             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.logger.exiting(class_name=self.__class_name, method_name=_method_name)
         return
 

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

@@ -148,6 +148,32 @@ 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):
+        """
+        Remove any targets for the JDBC resources in the specified dictionary.
+        Targets may have been inadvertently assigned when clusters were added after JDBC placeholders.
+        :param resources: dictionary containing the resources section of the model
+        """
+        _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)
+
+                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):
         """
         For the NM properties MBean, update the keystore file path to be fully qualified with the domain directory.

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

@@ -1343,6 +1343,7 @@ WLSDPLY-19400=Creating placeholder for server template {0}
 WLSDPLY-19401=Creating placeholder for JDBC resource {0}
 WLSDPLY-19402=Creating placeholder for Server resource {0}
 WLSDPLY-19403=Creating placeholder for {0} {1}
+WLSDPLY-19404=Clearing targets for {0} placeholder {1}
 
 # wlsdeploy/tool/util/variable_injector.py
 WLSDPLY-19500=Model variable injector values loaded from location {0}