temporary fix to hold on to the code that attempts to fix security configuration in 11g

Author: CarolynRountree

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

@@ -180,15 +180,17 @@ def _create_security_provider_mbeans(self, type_name, model_nodes, base_location
         location = LocationContext(base_location).append_location(type_name)
         self._process_flattened_folder(location)
 
+        # For create, delete the existing nodes, and re-add in order found in model in iterative code below
+        self._delete_existing_providers(location)
+
         token_name = self.alias_helper.get_name_token(location)
         create_path = self.alias_helper.get_wlst_create_path(location)
         list_path = self.alias_helper.get_wlst_list_path(location)
         existing_folder_names = self._get_existing_folders(list_path)
         known_providers = self.alias_helper.get_model_subfolder_names(location)
         allow_custom = str(self.alias_helper.is_custom_folder_allowed(location))
-
-        # For create, delete the existing nodes, and re-add in order found in model in iterative code below
-        self._delete_existing_providers(location)
+        self.logger.finer('create path {0}, list_path {1}, existing folders {2}', create_path, list_path,
+                          str(existing_folder_names))
 
         for model_name in model_nodes:
             model_node = model_nodes[model_name]
@@ -477,11 +479,12 @@ def _delete_existing_providers(self, location):
         :param location: current context of the location pointing at the provider mbean
         """
         _method_name = '_delete_existing_providers'
-        self.logger.entering(str(location), class_name=self.__class_name, method_name=_method_name)
+        self.logger.entering(location.get_folder_path(), class_name=self.__class_name, method_name=_method_name)
 
         list_path = self.alias_helper.get_wlst_list_path(location)
+        self.logger.finer('Look for providers at location {0}', list_path)
         existing_folder_names = self._get_existing_folders(list_path)
-        wlst_base_provider_type, wlst_name = self.alias_helper.get_wlst_mbean_type_and_name(location)
+        wlst_base_provider_type = self.alias_helper.get_wlst_mbean_type(location)
         if len(existing_folder_names) == 0:
             self.logger.finer('No default providers installed for {0} at {1}', wlst_base_provider_type, list_path)
         else:

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

@@ -49,7 +49,7 @@
 from wlsdeploy.exception import exception_helper
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.tool.create.creator import Creator
-from wlsdeploy.tool.create.security_provider_handler import SecurityProviderHandler
+from wlsdeploy.tool.create.security_provider_creator import SecurityProviderCreator
 from wlsdeploy.tool.deploy import model_deployer
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
 from wlsdeploy.tool.util.library_helper import LibraryHelper
@@ -80,7 +80,7 @@ def __init__(self, model_dictionary, model_context, aliases):
             raise ex
 
         self.topology_helper = TopologyHelper(self.aliases, ExceptionType.CREATE, self.logger)
-        self.security_provider_creator = SecurityProviderHandler(model_dictionary, model_context, aliases,
+        self.security_provider_creator = SecurityProviderCreator(model_dictionary, model_context, aliases,
                                                                  ExceptionType.CREATE, self.logger)
 
         self._domain_typedef = self.model_context.get_domain_typedef()
@@ -248,13 +248,6 @@ def __create_domain(self):
             self.__create_base_domain(self._domain_home)
             self.__extend_domain(self._domain_home)
 
-        # SecurityConfiguration is special since the subfolder name does not change when you change the domain name.
-        # It only changes once the domain is written and re-read...
-        location = LocationContext()
-        domain_name_token = self.alias_helper.get_name_token(location)
-        security_config_location = LocationContext().add_name_token(domain_name_token, self._domain_name)
-        self.security_provider_creator.create_security_configuration(security_config_location)
-
         if len(self.files_to_extract_from_archive) > 0:
             for file_to_extract in self.files_to_extract_from_archive:
                 self.archive_helper.extract_file(file_to_extract)
@@ -272,6 +265,7 @@ def __deploy(self):
         self.model_context.set_domain_home(self._domain_home)
         self.wlst_helper.read_domain(self._domain_home)
         self.__set_domain_attributes()
+        self._configure_security_configuration()
         self.__deploy_resources_and_apps()
         self.wlst_helper.update_domain()
         self.wlst_helper.close_domain()
@@ -835,8 +829,7 @@ def __set_admin_server_name(self):
 
     def __set_domain_attributes(self):
         """
-        Set the Domain attributes, which are in the top folder
-        :param location: current location context
+        Set the Domain attributes
         """
         _method_name = '__set_domain_attributes'
         self.logger.finer('WLSDPLY-12231', self._domain_name, class_name=self.__class_name, method_name=_method_name)
@@ -848,3 +841,20 @@ def __set_domain_attributes(self):
         self.wlst_helper.cd(attribute_path)
         self._set_attributes(location, attrib_dict)
         return
+
+    def _configure_security_configuration(self):
+        """
+        Configure the SecurityConfiguration MBean and its Realm sub-folder. In 11g, the SecurityConfiguration MBean
+        is not persisted to the domain config until the domain is first written.
+        :return:
+        """
+        _method_name = '_configure_security_configuration'
+        self.logger.entering(class_name=self.__class_name, method_name=_method_name)
+        # SecurityConfiguration is special since the subfolder name does not change when you change the domain name.
+        # It only changes once the domain is written and re-read...
+        location = LocationContext()
+        domain_name_token = self.alias_helper.get_name_token(location)
+        security_config_location = LocationContext().add_name_token(domain_name_token, self._domain_name)
+        self.security_provider_creator.create_security_configuration(security_config_location)
+        self.logger.exiting(class_name=self.__class_name, method_name=_method_name)
+        return

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

@@ -210,11 +210,11 @@ def is_system_wldf(self, name):
         """
         return self._is_system_name(name, 'wldf')
 
-    def configure_security_configuration_is_supported_by_tool(self):
+    def is_security_configuration_supported(self):
         """
         Determine if the security configuration can be configured. Currently, update domain does not
-        support configuration of any providers within a realm. Potentially safest to not touch security
-        configuration at all in order to not set values conducive to the realms (like active realm)
+        support configuration of the SecurityConfiguration, and 11g create domain does not support
+        configuration of the SecurityConfiguration
 
         :return: True if the security realm can be configured
         """