Add psu to alias version

Author: CarolynRountree

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

@@ -790,7 +790,6 @@ def is_valid_model_folder_name_for_location(self, location, model_folder_name):
                 result = ValidationCodes.VALID
         else:
             folder_dict = self.__get_dictionary_for_location(location, False)
-
             if folder_dict is None:
                 ex = exception_helper.create_alias_exception('WLSDPLY-08113', model_folder_name,
                                                              location.get_folder_path())

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

@@ -1418,7 +1418,8 @@
         "RealmBootStrapVersion":                 [ {"version": "[10,12.2.1)", "wlst_mode": "offline", "wlst_name": "RealmBootStrapVersion",              "wlst_path": "WP001", "value": {"default": "None"    }, "wlst_type": "string",         "get_method": "GET", "restart_required": "true" } ,
                                                    {"version": "[10,)",       "wlst_mode": "online", "wlst_name": "RealmBootStrapVersion",               "wlst_path": "WP001", "value": {"default": "1"       }, "wlst_type": "string",         "get_method": "GET", "restart_required": "true" } ],
         "RemoteAnonymousJndiEnabled":            [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "RemoteAnonymous${Jndi:JNDI}Enabled",    "wlst_path": "WP001", "value": {"default": "true"    }, "wlst_type": "boolean",        "restart_required": "true"  } ],
-        "RemoteAnonymousRmiiiopEnabled":         [ {"version": "[14.1.1,)",   "wlst_mode": "both", "wlst_name": "RemoteAnonymous${Rmiiiop:RMIIIOP}Enabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"         } ],
+        "RemoteAnonymousRmiiiopEnabled":         [ {"version": "[14.1.1,)",   "wlst_mode": "both", "wlst_name": "RemoteAnonymous${Rmiiiop:RMIIIOP}Enabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"         },
+                                                    {"version": "[12.2.1.3.33344,12.2.1.4)",   "wlst_mode": "both", "wlst_name": "RemoteAnonymous${Rmiiiop:RMIIIOP}Enabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"         } ],
         "RemoteAnonymousRmit3Enabled":           [ {"version": "[14.1.1,)",   "wlst_mode": "both", "wlst_name": "RemoteAnonymous${Rmit3:RMIT3}Enabled",  "wlst_path": "WP001", "value": {"default": "true"    }, "wlst_type": "boolean"         } ],
         "UseKSSForDemo":                         [ {"version": "[12.1.2,)",   "wlst_mode": "both", "wlst_name": "UseKSSForDemo",                         "wlst_path": "WP001", "value": {"default": "false"   }, "wlst_type": "boolean",        "restart_required": "true" } ],
         "WebAppFilesCaseInsensitive":            [ {"version": "[10,)",       "wlst_mode": "both", "wlst_name": "WebAppFilesCaseInsensitive",            "wlst_path": "WP001", "value": {"default": "${None:false}"}, "wlst_type": "string",    "restart_required": "true" } ]

core/src/test/python/aliases_test.py

@@ -440,6 +440,46 @@ def testIsWlstModelAttributeName(self):
         self.assertEqual(message, expected)
         return
 
+    def testIsPSUMatch(self):
+        wls_version = '12.2.1.3.33344'
+        arg_map = {
+            CommandLineArgUtil.ORACLE_HOME_SWITCH: '/oracleHome',
+            CommandLineArgUtil.DOMAIN_HOME_SWITCH: '',
+            CommandLineArgUtil.TARGET_VERSION_SWITCH: '12.2.1.3.33344'
+        }
+
+        this_model_context = ModelContext("test", arg_map)
+
+        online_aliases = Aliases(this_model_context, WlstModes.ONLINE, wls_version)
+        location = LocationContext()
+        location.append_location('SecurityConfiguration')
+        location.add_name_token(online_aliases.get_name_token(location), 'domain')
+        location.add_name_token('domain', 'system_test')
+        model_attribute_name = 'RemoteAnonymousRmiiiopEnabled'
+        value, message = online_aliases.is_valid_model_attribute_name(location, model_attribute_name)
+
+        self.assertEqual(value, 2)
+
+        wls_version = '12.2.1.5'
+        arg_map = {
+            CommandLineArgUtil.ORACLE_HOME_SWITCH: '/oracleHome',
+            CommandLineArgUtil.DOMAIN_HOME_SWITCH: '',
+            CommandLineArgUtil.TARGET_VERSION_SWITCH: '12.2.1.5'
+        }
+
+        this_model_context = ModelContext("test", arg_map)
+
+        online_aliases = Aliases(this_model_context, WlstModes.ONLINE, wls_version)
+        location = LocationContext()
+        location.append_location('SecurityConfiguration')
+        location.add_name_token(online_aliases.get_name_token(location), 'domain')
+        location.add_name_token('domain', 'system_test')
+        model_attribute_name = 'RemoteAnonymousRmiiiopEnabled'
+        value, message = online_aliases.is_valid_model_attribute_name(location, model_attribute_name)
+
+        self.assertEqual(value, 1)
+        return
+
     def testPropertyTypes(self):
         expected = Properties()
         expected.put('key1', 'val1')