eliminate alias folder is not an mbean errors (#1242)

Author: robertpatrick

integration-tests/alias-test/generate/src/test/python/aliastest/generate/generator_offline.py

@@ -122,7 +122,7 @@ def __folder_hierarchy(self, mbean_dictionary, online_dictionary, mbean_path, pa
 
             if self._is_valid_folder(mbean_helper):
                 if mbean_type in PROVIDERS:
-                    print('Found security provider folder ', mbean_type)
+                    self.__logger.fine('Found security provider folder {0}', mbean_type)
                     success, lsc_name, attributes = self.create_security_type(mbean_type)
                     mbean_dictionary[lsc_name] = attributes
                     continue
@@ -150,8 +150,17 @@ def __folder_hierarchy(self, mbean_dictionary, online_dictionary, mbean_path, pa
                                        online_dictionary_name, parent_mbean_type,
                                        class_name=self.__class_name, method_name=_method_name)
                     methods_name_list.remove(online_dictionary_name)
-                success, lsc_name, attributes = \
-                    self.__generate_folder(mbean_instance, parent_mbean_type, online_dictionary_name, None)
+
+                # Have to make sure what we are processing is not a security provider type.
+                if online_dictionary_name in PROVIDERS:
+                    self.__logger.fine('Found security provider folder {0} in online_dictionary_names',
+                                       online_dictionary_name)
+                    success, lsc_name, attributes = self.create_security_type(online_dictionary_name)
+                    mbean_dictionary[lsc_name] = attributes
+                    continue
+                else:
+                    success, lsc_name, attributes = \
+                        self.__generate_folder(mbean_instance, parent_mbean_type, online_dictionary_name, None)
                 if success:
                     self.__logger.fine('Processing MBean {0} child {1} from online dictionary',
                                        lsc_name, parent_mbean_type,

integration-tests/alias-test/verify/src/test/python/aliastest/verify/verifier.py

@@ -146,6 +146,23 @@
 MESSAGE = 'message'
 ATTRIBUTE = 'attribute'
 
+ALIAS_FOLDER_IGNORE_MAP = {
+    '/': [
+        'ODLConfiguration',
+        'OHS',
+        'RCUDbInfo',
+        'Security',
+        'UnixMachine',
+        'WLSRoles',
+        'WLSUserPasswordCredentialMappings'
+    ],
+    '/ResourceGroupTemplate': [
+        'OHS',
+        'SystemComponent',
+        'SystemComponents'
+    ]
+}
+
 _logger = PlatformLogger('test.aliases.verify')
 _logger.set_level(Level.FINER)
 CLASS_NAME = 'Verifier'
@@ -299,6 +316,9 @@ def _check_generated_against_alias_folders(self, location, generated_dictionary,
                            class_name=CLASS_NAME, method_name=_method_name)
             if keys is not None:
                 for alias_name in keys:
+                    if _is_in_ignore_list(location, alias_name):
+                        continue
+
                     found, mbean_info_name = verify_utils.find_name_in_mbean_with_model_name(alias_name, lower_case_map)
                     if found:
                         _logger.fine('Alias mbean type {0} found in dictionary as {1}', alias_name, mbean_info_name,
@@ -1478,6 +1498,13 @@ def _get_dict_key_from_value(alias_name_map, lower_case_value):
     return result
 
 
+def _is_in_ignore_list(location, alias_name):
+    path = location.get_folder_path()
+    if path in ALIAS_FOLDER_IGNORE_MAP and alias_name in ALIAS_FOLDER_IGNORE_MAP[path]:
+        return True
+    return False
+
+
 class VerifierResult(object):
     CLASS_NAME = 'VerifierResult'