fixing alias test anomalies (#1245)

Author: robertpatrick

core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/AppDeployment.json

@@ -67,7 +67,7 @@
         "PlanStagingMode":                   [ {"version": "[12.1.2,)",    "wlst_mode": "both",    "wlst_name": "PlanStagingMode",                    "wlst_path": "WP001", "default_value": null,       "wlst_type": "string",          "access": "${:ROD}"} ],
         "RootStagingDir":                    [ {"version": "[10,)",        "wlst_mode": "online",  "wlst_name": "RootStagingDir",                     "wlst_path": "WP001", "default_value": null,       "wlst_type": "string",          "get_method": "GET", "uses_path_tokens": "true", "access": "RO"  } ],
         "SecurityDDModel":                   [ {"version": "[10,12.1.2)",  "wlst_mode": "both",    "wlst_name": "Security${Dd:DD}Model",              "wlst_path": "WP001", "default_value": "DDOnly",   "wlst_type": "string",          "access": "${:ROD}" },
-                                               {"version": "[12.1.2,)",    "wlst_mode": "both",    "wlst_name": "SecurityDDModel",                    "wlst_path": "WP001", "default_value": "DDOnly",   "wlst_type": "string",          "access": "${:ROD}" }],
+                                               {"version": "[12.1.2,)",    "wlst_mode": "both",    "wlst_name": "SecurityDDModel",                    "wlst_path": "WP001", "default_value": "${__NULL__:DDOnly}",   "wlst_type": "string",          "access": "${:ROD}" }],
         "SourcePath":                        [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "SourcePath",                         "wlst_path": "WP001", "default_value": null,       "wlst_type": "string",          "access": "${:ROD}", "uses_path_tokens": "true" } ],
         "StagingMode":                       [ {"version": "[10,)",        "wlst_mode": "both",    "wlst_name": "StagingMode",                        "wlst_path": "WP001", "default_value": null,       "wlst_type": "string",          "access": "${:ROD}"  }],
         "Target":                            [ {"version": "[10,)",        "wlst_mode": "offline", "wlst_name": "Target",                             "wlst_path": "WP001", "default_value": null,       "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },

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

@@ -22,6 +22,26 @@
 __logger.set_level(Level.FINER)
 CLASS_NAME = 'generate/utils'
 
+OFFLINE_ALIAS_FOLDER_IGNORE_MAP = {
+    '/': ['ODLConfiguration', 'OHS', 'RCUDbInfo', 'Security', 'UnixMachine', 'WLSRoles',
+          'WLSUserPasswordCredentialMappings'],
+    '/ResourceGroupTemplate': ['OHS', 'SystemComponent']
+}
+
+ONLINE_ALIAS_FOLDER_IGNORE_MAP = {
+    '/ResourceGroupTemplate': ['SystemComponents']
+}
+
+OFFLINE_TEST_ANOMALIES_MAP = {
+    '/Application': {
+        'ModuleType': 'war',
+        'SourcePath': 'wlsdeploy/applications/get-listen-address-app.war'
+    },
+    '/Library': {
+        'ModuleType': 'war',
+        'SourcePath': 'wlsdeploy/sharedLibraries/jstl-1.2.war'
+    }
+}
 
 def get_verify_args_map(args):
     """
@@ -200,6 +220,25 @@ def sort_dict(dictionary):
     return new_dictionary
 
 
+def is_alias_folder_in_ignore_list(model_context, location, alias_name):
+    if model_context.get_target_wlst_mode == WlstModes.ONLINE:
+        ignore_map = ONLINE_ALIAS_FOLDER_IGNORE_MAP
+    else:
+        ignore_map = OFFLINE_ALIAS_FOLDER_IGNORE_MAP
+
+    path = location.get_folder_path()
+    if path in ignore_map and alias_name in ignore_map[path]:
+        return True
+    return False
+
+
+def is_attribute_value_test_anomaly(model_context, location, attribute_name, attribute_value):
+    anomaly_map = OFFLINE_TEST_ANOMALIES_MAP
+    path = location.get_folder_path()
+    return path in anomaly_map and attribute_name in anomaly_map[path] and \
+        anomaly_map[path][attribute_name] == attribute_value
+
+
 def _key_in_case_map(key, case_map):
     if key in case_map:
         return case_map[key]

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

@@ -146,23 +146,6 @@
 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'
@@ -316,7 +299,7 @@ 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):
+                    if verify_utils.is_alias_folder_in_ignore_list(self._model_context, location, alias_name):
                         continue
 
                     found, mbean_info_name = verify_utils.find_name_in_mbean_with_model_name(alias_name, lower_case_map)
@@ -798,15 +781,16 @@ def _is_valid_default_value(self, location, generated_attribute, generated_attri
         # is not marked as a derived_default.
         #
         if match and model_value is not None and not is_derived_default:
-            attr_type = type(generated_default)
-            if CMO_TYPE in generated_attribute_info and \
-                    (generated_attribute_info[CMO_TYPE] == alias_constants.BOOLEAN or
-                     generated_attribute_info[CMO_TYPE] == alias_constants.JAVA_LANG_BOOLEAN) and \
-                    generated_default is not None and (attr_type in [str, unicode, int]):
-                generated_default = Boolean(generated_default)
-            message = 'Attribute=%s  :  Alias=%s' % (str(generated_default), str(model_default_value))
-            self._add_error(location, ERROR_ATTRIBUTE_WRONG_DEFAULT_VALUE,
-                            message=message, attribute=generated_attribute)
+            if not verify_utils.is_attribute_value_test_anomaly(self._model_context, location, model_name, model_value):
+                attr_type = type(generated_default)
+                if CMO_TYPE in generated_attribute_info and \
+                        (generated_attribute_info[CMO_TYPE] == alias_constants.BOOLEAN or
+                         generated_attribute_info[CMO_TYPE] == alias_constants.JAVA_LANG_BOOLEAN) and \
+                        generated_default is not None and (attr_type in [str, unicode, int]):
+                    generated_default = Boolean(generated_default)
+                message = 'Attribute=%s  :  Alias=%s' % (str(generated_default), str(model_default_value))
+                self._add_error(location, ERROR_ATTRIBUTE_WRONG_DEFAULT_VALUE,
+                                message=message, attribute=generated_attribute)
 
         _logger.exiting(result=verify_utils.bool_to_string(match), class_name=CLASS_NAME, method_name=_method_name)
         return match, model_name, model_value
@@ -1498,13 +1482,6 @@ 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'