Save without testing

Author: CarolynRountree

core/src/main/python/create.py

@@ -33,6 +33,7 @@
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.create.domain_creator import DomainCreator
 from wlsdeploy.tool.create.domain_typedef import DomainTypedef
+from wlsdeploy.tool.create.domain_typedef import CREATE_DOMAIN
 from wlsdeploy.tool.util import filter_helper
 from wlsdeploy.tool.validate.validator import Validator
 from wlsdeploy.util import getcreds
@@ -44,7 +45,8 @@
 from wlsdeploy.util.model_translator import FileToPython
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
-_program_name = 'createDomain'
+_program_name = CREATE_DOMAIN
+
 _class_name = 'create'
 __logger = PlatformLogger('wlsdeploy.create')
 __wlst_mode = WlstModes.OFFLINE

core/src/main/python/update.py

@@ -33,6 +33,7 @@
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.create.domain_typedef import DomainTypedef
+from wlsdeploy.tool.create.domain_typedef import UPDATE_DOMAIN
 from wlsdeploy.tool.deploy import deployer_utils
 from wlsdeploy.tool.deploy import model_deployer
 from wlsdeploy.tool.deploy.topology_updater import TopologyUpdater
@@ -50,7 +51,7 @@
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
 
-_program_name = 'updateDomain'
+_program_name = UPDATE_DOMAIN
 _class_name = 'update'
 __logger = PlatformLogger('wlsdeploy.update')
 __wls_helper = WebLogicHelper(__logger)

core/src/main/python/wlsdeploy/aliases/aliases.py

@@ -318,7 +318,7 @@ def get_wlst_flattened_mbean_name(self, location):
         """
         Get the flattened WLST folder name.
         :param location: the location
-        :return: the flattened folder name
+        :return: the flattened  folder name
         :raises: AliasException: if an error occurs due to a bad location or bad alias data
         """
         return self._alias_entries.get_wlst_flattened_name_for_location(location)

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_creator import SecurityProviderCreator
+from wlsdeploy.tool.create.security_provider_handler import SecurityProviderHandler
 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 = SecurityProviderCreator(model_dictionary, model_context, aliases,
+        self.security_provider_creator = SecurityProviderHandler(model_dictionary, model_context, aliases,
                                                                  ExceptionType.CREATE, self.logger)
 
         self._domain_typedef = self.model_context.get_domain_typedef()
@@ -248,6 +248,13 @@ 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)
@@ -403,10 +410,6 @@ def __apply_base_domain_config(self, topology_folder_list):
         self.__create_security_folder(location)
         topology_folder_list.remove(SECURITY)
 
-        # 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...
-        security_config_location = LocationContext().add_name_token(domain_name_token, self.__default_domain_name)
-        self.security_provider_creator.create_security_configuration(security_config_location)
         topology_folder_list.remove(SECURITY_CONFIGURATION)
 
         self.__create_mbeans_used_by_topology_mbeans(location, topology_folder_list)

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

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
 import javaos as os
@@ -14,6 +14,9 @@
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
 from wlsdeploy.util.weblogic_helper import WebLogicHelper
 
+CREATE_DOMAIN = 'createDomain'
+UPDATE_DOMAIN = 'updateDomain'
+
 
 class DomainTypedef(object):
     """
@@ -38,6 +41,7 @@ def __init__(self, program_name, domain_type):
         self._logger = PlatformLogger('wlsdeploy.create')
         self._program_name = program_name
         self._domain_type = domain_type
+        self.wls_helper = WebLogicHelper(self._logger)
 
         self._domain_typedef_filename = \
             os.path.join(self.__domain_typedefs_location, domain_type + self.__domain_typedef_extension)
@@ -206,6 +210,16 @@ def is_system_wldf(self, name):
         """
         return self._is_system_name(name, 'wldf')
 
+    def configure_realm_is_supported_by_tool(self, realm):
+        """
+        Determine if the realm can be configured. Currently, update domain does not support configuration of any
+        realm.
+        #param realm_name: can the tool configure this realm
+        :return: True if the security realm can be configured
+        """
+        # self.wls_helper.get_default_security_realm_name() == realm_name
+        return self._program_name != UPDATE_DOMAIN
+
     def _is_system_name(self, name, key):
         """
         Determine if the specified name matches a WLS name of the specified type key.
@@ -272,12 +286,12 @@ def __get_version_typedef(self):
         """
         _method_name = '__get_version_typedef'
 
-        if not 'versions' in self._domain_typedefs_dict:
+        if 'versions' not in self._domain_typedefs_dict:
             ex = exception_helper.create_create_exception('WLSDPLY-12304', self._domain_type,
                                                           self._domain_typedef_filename)
             self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
-        elif not 'definitions' in self._domain_typedefs_dict:
+        elif 'definitions' not in self._domain_typedefs_dict:
             ex = exception_helper.create_create_exception('WLSDPLY-12305', self._domain_type,
                                                           self._domain_typedef_filename)
             self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
@@ -309,23 +323,22 @@ def __match_version_typedef(self, versions_dict):
             self._logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
             raise ex
 
-        wls_helper = WebLogicHelper(self._logger)
-        wls_version = wls_helper.get_actual_weblogic_version()
+        wls_version = self.wls_helper.get_actual_weblogic_version()
         self._logger.fine('WLSDPLY-12310', wls_version, class_name=self.__class_name, method_name=_method_name)
 
         result = None
         if wls_version in versions_dict:
             result = versions_dict[wls_version]
         else:
-            new_version = wls_helper.get_next_higher_order_version_number(wls_version)
+            new_version = self.wls_helper.get_next_higher_order_version_number(wls_version)
             while new_version is not None:
                 if new_version in versions_dict:
                     result = versions_dict[new_version]
                     self._logger.finer('WLSDPLY-12308', self._domain_type, self._domain_typedef_filename,
                                        new_version, wls_version, class_name=self.__class_name, method_name=_method_name)
                     break
                 else:
-                    new_version = wls_helper.get_next_higher_order_version_number(new_version)
+                    new_version = self.wls_helper.get_next_higher_order_version_number(new_version)
 
             if result is None:
                 ex = exception_helper.create_create_exception('WLSDPLY-12309', self._domain_type,

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

@@ -2,6 +2,7 @@
 Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 """
+import warnings
 
 from wlsdeploy.aliases.location_context import LocationContext
 from wlsdeploy.aliases.model_constants import ACTIVE_TYPE
@@ -40,15 +41,18 @@
 
 class SecurityProviderCreator(Creator):
     """
-    The class that drives security provider creation and updates.
-    Shared by create domain and update domain.
+    This class has been deprecated. There is no way to successfully handle the AuthenticationProviders in
+    offline wlst for the default security realm in 11g. You cannot change the names of both providers in
+    the AuthenticationProvider during create domain which uses offline wlst.
     """
     __class_name = 'SecurityProviderHelper'
 
     def __init__(self, model_dictionary, model_context, aliases, exception_type, logger):
         Creator.__init__(self, model_dictionary, model_context, aliases, exception_type, logger)
 
         self._topology = self.model.get_model_topology()
+        warnings.warn('Deprecated class. Use SecurityProviderHelper instead', DeprecationWarning)
+        return
 
         #
         # Creating domains with the wls.jar template is busted for pre-12.1.2 domains with regards to the