Merge branch 'jrf-1412' into 'main'

cleaning up unicode handling in a few spots we missed previously

See merge request weblogic-cloud/weblogic-deploy-tooling!1522

Author: robertpatrick

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

@@ -430,7 +430,7 @@ def _get_server_group_targeting_limits(self, server_group_targeting_limits, clus
 
         sg_targeting_limits = copy.deepcopy(server_group_targeting_limits)
         for server_group_name, sg_targeting_limit in sg_targeting_limits.iteritems():
-            if type(sg_targeting_limit) is str:
+            if isinstance(sg_targeting_limit, basestring):
                 if MODEL_LIST_DELIMITER in sg_targeting_limit:
                     sg_targeting_limit = sg_targeting_limit.split(MODEL_LIST_DELIMITER)
                 else:
@@ -474,7 +474,7 @@ def _get_dynamic_cluster_server_group_targeting_limits(self, targeting_limits, c
 
         dc_sg_targeting_limits = copy.deepcopy(targeting_limits)
         for server_group_name, dc_sg_targeting_limit in dc_sg_targeting_limits.iteritems():
-            if type(dc_sg_targeting_limit) is str:
+            if isinstance(dc_sg_targeting_limit, basestring):
                 if MODEL_LIST_DELIMITER in dc_sg_targeting_limit:
                     dc_sg_targeting_limit = dc_sg_targeting_limit.split(MODEL_LIST_DELIMITER)
                 else:

core/src/main/python/wlsdeploy/tool/validate/validator.py

@@ -895,7 +895,7 @@ def __validate_server_group_targeting_limits(self, attribute_key, attribute_valu
             else:
                 model_folder_path += '/' + attribute_key
                 for key, value in attribute_value.iteritems():
-                    if type(key) is not str:
+                    if not isinstance(key, basestring):
                         # Force the key to a string for any value validation issues reported below
                         key = str_helper.to_string(key)
                         self._logger.severe('WLSDPLY-05033', str_helper.to_string, model_folder_path,
@@ -912,7 +912,7 @@ def __validate_server_group_targeting_limits(self, attribute_key, attribute_valu
                         for element in value:
                             self._validate_single_server_group_target_limits_value(key, element,
                                                                                    model_folder_path)
-                    elif type(value) is str:
+                    elif isinstance(value, basestring):
                         self._validate_single_server_group_target_limits_value(key, value, model_folder_path)
                     else:
                         self._logger.severe('WLSDPLY-05034', key, model_folder_path,

core/src/main/typedefs/JRF-Compact.json

@@ -13,7 +13,8 @@
         "12.2.1.3": "JRF_12CR2",
         "12.2.1.4": "JRF_12CR2_LAST",
         "12.2.1.5": "JRF_12CR2_LAST",
-        "14.1":     "NOT_SUPPORTED"
+        "14.1":     "NOT_SUPPORTED",
+        "14.1.2":   "JRF_14"
     },
     "definitions": {
         "JRF_12CR2_FIRST": {
@@ -51,6 +52,18 @@
             "customExtensionTemplates": [ ],
             "serverGroupsToTarget": [ ],
             "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+        },
+        "JRF_14": {
+            "baseTemplate": "Basic WebLogic Server Domain",
+            "extensionTemplates": [
+                "Oracle JRF",
+                "Oracle JRF WebServices Asynchronous services",
+                "Oracle WSM Policy Manager",
+                "Oracle Enterprise Manager"
+            ],
+            "customExtensionTemplates": [ ],
+            "serverGroupsToTarget": [ ],
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
         }
     },
     "discover-filters": {

core/src/main/typedefs/JRF.json

@@ -12,7 +12,8 @@
         "12.2.1.3": "JRF_12CR2",
         "12.2.1.4": "JRF_12CR2_LAST",
         "12.2.1.5": "JRF_12CR2_LAST",
-        "14.1":     "NOT_SUPPORTED"
+        "14.1.1" :  "NOT_SUPPORTED",
+        "14.1.2":   "JRF_14"
     },
     "definitions": {
         "JRF_11G" : {
@@ -88,6 +89,19 @@
             "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
             "dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER", "WSM-CACHE-DYN-CLUSTER" ],
             "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
+        },
+        "JRF_14": {
+            "baseTemplate": "Basic WebLogic Server Domain",
+            "extensionTemplates": [
+                "Oracle JRF",
+                "Oracle JRF WebServices Asynchronous services",
+                "Oracle WSM Policy Manager",
+                "Oracle Enterprise Manager"
+            ],
+            "customExtensionTemplates": [ ],
+            "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
+            "dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER", "WSM-CACHE-DYN-CLUSTER" ],
+            "rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
         }
     },
     "discover-filters": {

core/src/main/typedefs/RestrictedJRF.json

@@ -10,24 +10,34 @@
         "12.2.1.3": "RJRF_12CR2",
         "12.2.1.4": "RJRF_12CR2",
         "12.2.1.5": "RJRF_12CR2",
-        "14.1.1": "NOT_SUPPORTED"
+        "14.1.1":   "NOT_SUPPORTED",
+        "14.1.2":   "RJRF_14"
     },
     "definitions": {
         "RJRF_12CR2_FIRST": {
             "baseTemplate": "Basic WebLogic Server Domain",
             "extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
             "customExtensionTemplates": [ ],
-            "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"],
+            "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
             "rcuSchemas": [ ]
         },
         "RJRF_12CR2": {
             "baseTemplate": "Basic WebLogic Server Domain",
             "extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
             "customExtensionTemplates": [ ],
-            "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"],
+            "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"] ,
+            "dynamicClusterServerGroupsToTarget" : [ "WSM-CACHE-DYN-CLUSTER" ],
+            "rcuSchemas": [ ]
+        },
+        "RJRF_14": {
+            "baseTemplate": "Basic WebLogic Server Domain",
+            "extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
+            "customExtensionTemplates": [ ],
+            "serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
             "dynamicClusterServerGroupsToTarget" : [ "WSM-CACHE-DYN-CLUSTER" ],
             "rcuSchemas": [ ]
         }
+
     },
     "discover-filters": {
         "/Application": [

core/src/test/python/alias_json_file_test.py

@@ -704,7 +704,7 @@ def _verify_attribute_wlst_type_attribute_value(self, folder_name, attribute_nam
     def _verify_boolean_value(self, folder_name, attribute_name, alias_attribute_name, alias_attribute_value):
         result = []
         constrained_string_values = ['true', 'false']
-        if type(alias_attribute_value) is str:
+        if isinstance(alias_attribute_value, basestring):
             if alias_attribute_value.lower() not in constrained_string_values:
                 result.append(self._get_invalid_attribute_boolean_string_value_message(folder_name, attribute_name,
                                                                                        alias_attribute_name,