JIRA WDT-47 Pass required values to custom folder helper

Author: rakillen

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

@@ -200,9 +200,13 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
                 self.logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
                 raise ex
 
+            model_type_subfolder_name = list(model_node.keys())[0]
+            child_nodes = dictionary_utils.get_dictionary_element(model_node, model_type_subfolder_name)
+
             # custom providers require special processing, they are not described in alias framework
-            if allow_custom and (model_name not in known_providers):
-                self.custom_folder_helper.update_security_folder(location, model_name, model_node)
+            if allow_custom and (model_type_subfolder_name not in known_providers):
+                self.custom_folder_helper.update_security_folder(base_location, type_name, model_type_subfolder_name,
+                                                                 model_name, child_nodes)
                 continue
 
             # for a known provider, process using aliases
@@ -213,7 +217,6 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
 
             wlst_base_provider_type, wlst_name = self.alias_helper.get_wlst_mbean_type_and_name(prov_location)
 
-            model_type_subfolder_name = list(model_node.keys())[0]
             prov_location.append_location(model_type_subfolder_name)
             wlst_type = self.alias_helper.get_wlst_mbean_type(prov_location)
 
@@ -237,7 +240,6 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
             attribute_path = self.alias_helper.get_wlst_attributes_path(prov_location)
             self.wlst_helper.cd(attribute_path)
 
-            child_nodes = dictionary_utils.get_dictionary_element(model_node, model_type_subfolder_name)
             self.logger.finest('WLSDPLY-12111', self.alias_helper.get_model_folder_path(prov_location),
                                self.wlst_helper.get_pwd(), class_name=self.__class_name, method_name=_method_name)
             self._set_attributes(prov_location, child_nodes)

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

@@ -20,17 +20,26 @@ def __init__(self, aliases, logger, exception_type):
         self.alias_helper = AliasHelper(aliases, self.logger, self.exception_type)
         self.wlst_helper = WlstHelper(self.logger, self.exception_type)
 
-    def update_security_folder(self, location, model_name, model_nodes):
+    def update_security_folder(self, location, model_category, model_type, model_name, model_nodes):
         """
         Update the specified security model nodes in WLST.
-        :param location: the location of the folder's parent
-        :param model_name: the model name of the folder to be updated
-        :param model_nodes: a child model nodes of the folder to be updated
+        :param location: the location for the provider
+        :param model_category: the model category of the provider to be updated
+        :param model_type: the model type of the provider to be updated
+        :param model_name: the model name of the provider to be updated
+        :param model_nodes: a child model nodes of the provider to be updated
         :raises: BundleAwareException of the specified type: if an error occurs
         """
         _method_name = 'update_security_folder'
 
-        self.logger.entering(str(location), model_name, class_name=self.__class_name, method_name=_method_name)
+        location_path = self.alias_helper.get_model_folder_path(location)
+        self.logger.entering(location_path, model_type, model_name,
+                             class_name=self.__class_name, method_name=_method_name)
 
-        self.logger.info('WLSDPLY-12124', model_name, self.alias_helper.get_model_folder_path(location),
+        self.logger.info('WLSDPLY-12124', model_category, model_name, model_type, location_path,
                          class_name=self.__class_name, method_name=_method_name)
+
+        # create the MBean using the model name, model_type, category
+
+        # wlst.create(model_name, model_type, category)
+        # wlst.create('RAK-SAML', 'SAMLAuthenticator', 'AuthenticationProvider')

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

@@ -949,7 +949,7 @@ WLSDPLY-12122=The attribute {0} in model location {1} has value {2} that referen
   archive file but the archive file was not provided
 # The WLSDPLY-12123 resource is used for messages returned from aliases.is_version_valid_location()
 WLSDPLY-12123={0}
-WLSDPLY-12124=Updating custom security folder {0} at location {1}
+WLSDPLY-12124=Updating {0} "{1}" ({2}) at location {3}
 
 # domain_creator.py
 WLSDPLY-12200={0} did not find the required {1} section in the model file {2}