JIRA WDT-47 Revised provider location check, removed unused method

Author: rakillen

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

@@ -94,13 +94,6 @@ def get_mode_enum(self):
         """
         return self._wlst_mode
 
-    def get_version(self):
-        """
-        Get the version instance
-        :return: version of this aliases instance
-        """
-        return self._wls_version
-
     def get_model_top_level_folder_names(self):
         """
         Returns a list of the recognized top-level model folders corresponding to the known WLST top-level folders.
@@ -290,6 +283,18 @@ def is_custom_folder_allowed(self, location):
         return self._alias_entries.is_location_child_folder_type(location,
                                                                  ChildFoldersTypes.MULTIPLE_WITH_TYPE_SUBFOLDER)
 
+    def is_security_provider_type(self, location):
+        """
+        Returns true if the specified location is a security provider type, such as AuthenticationProvider.
+        This currently corresponds to all MULTIPLE_WITH_TYPE_SUBFOLDER entries.
+        This will need to be refined if new custom types are added, or additional distinctions are required.
+        :param location: the location to be checked
+        :return: True if the location is a security provider type, False otherwise
+        :raises: AliasException: if an error occurs while getting the folder for the location
+        """
+        return self._alias_entries.is_location_child_folder_type(location,
+                                                                 ChildFoldersTypes.MULTIPLE_WITH_TYPE_SUBFOLDER)
+
     ###########################################################################
     #                     WLST Folder create-related methods                  #
     ###########################################################################

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -645,12 +645,15 @@ def _inspect_artificial_folder_name(self, folder_name, location):
         return self._inspect_security_folder_name(folder_name, location)
 
     def _inspect_security_folder_name(self, folder_name, location):
-        # This is so clunky. My alias definition change was rejected.
+        # This is clunky - Some security providers in 11g offline have the name "Provider", and cannot be discovered.
+        # If found, log and throw an exception here, and the SecurityConfiguration will be omitted from the model.
+
         if (not self._weblogic_helper.is_version_in_12c()) and self._wlst_mode == WlstModes.OFFLINE and \
-                'SecurityConfiguration' in location.get_folder_path() and 'Provider' == folder_name:
+                self._alias_helper.is_security_provider_type(location) and 'Provider' == folder_name:
             raise exception_helper.create_discover_exception('WLSDPLY-06201', folder_name, location.get_folder_path())
-        _logger.info('version {0} mode {1} folder {2} provider {3}', not self._weblogic_helper.is_version_in_12c(),
-                     self._wlst_mode == WlstModes.OFFLINE, 'SecurityConfiguration' in location.get_folder_path(),
+
+        _logger.fine('version {0} mode {1} type? {2} provider {3}', not self._weblogic_helper.is_version_in_12c(),
+                     self._wlst_mode == WlstModes.OFFLINE, self._alias_helper.is_security_provider_type(location),
                      'Provider' == folder_name)
         return folder_name
 

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

@@ -293,6 +293,24 @@ def is_custom_folder_allowed(self, location):
             raise ex
         return result
 
+    def is_security_provider_type(self, location):
+        """
+        Returns true if the specified location is a security provider type.
+        :param location: the location to be checked
+        :return: True, if the location is a security provider type, False otherwise
+        :raises: BundleAwareException of the specified type: if an error occurs
+        """
+        _method_name = 'is_security_provider_type'
+
+        try:
+            result = self.__aliases.is_security_provider_type(location)
+        except AliasException, ae:
+            ex = exception_helper.create_exception(self.__exception_type, 'WLSDPLY-19036', str(location),
+                                                   ae.getLocalizedMessage(), error=ae)
+            self.__logger.throwing(ex, class_name=self.__class_name, method_name=_method_name)
+            raise ex
+        return result
+
     def get_wlst_mbean_name(self, location):
         """
         Get the MBean name to use to create it for the specified location.

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

@@ -1119,6 +1119,7 @@ WLSDPLY-19033=Failed to determine if location ({0}) is version valid, or not
 WLSDPLY-19034=Failed to get the model attribute list that require a special processing via a method for model \
   folder ({0}) at location ({1}): {2}
 WLSDPLY-19035=Failed to determine if the location ({0}) allows custom folder types: {1}
+WLSDPLY-19036=Failed to determine if the location ({0}) is a security provider: {1}
 
 # wlsdeploy/tool/util/wlst_helper.py
 WLSDPLY-19100=Failed to change to the WLST directory {0}: {1}