Skip to content

Commit 4131396

Browse files
robertpatrickrobertpatrick
committed
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
2 parents 52ff51e + cfb9b2f commit 4131396

File tree

6 files changed

+47
-10
lines changed

6 files changed

+47
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ def _get_server_group_targeting_limits(self, server_group_targeting_limits, clus
430430

431431
sg_targeting_limits = copy.deepcopy(server_group_targeting_limits)
432432
for server_group_name, sg_targeting_limit in sg_targeting_limits.iteritems():
433-
if type(sg_targeting_limit) is str:
433+
if isinstance(sg_targeting_limit, basestring):
434434
if MODEL_LIST_DELIMITER in sg_targeting_limit:
435435
sg_targeting_limit = sg_targeting_limit.split(MODEL_LIST_DELIMITER)
436436
else:
@@ -474,7 +474,7 @@ def _get_dynamic_cluster_server_group_targeting_limits(self, targeting_limits, c
474474

475475
dc_sg_targeting_limits = copy.deepcopy(targeting_limits)
476476
for server_group_name, dc_sg_targeting_limit in dc_sg_targeting_limits.iteritems():
477-
if type(dc_sg_targeting_limit) is str:
477+
if isinstance(dc_sg_targeting_limit, basestring):
478478
if MODEL_LIST_DELIMITER in dc_sg_targeting_limit:
479479
dc_sg_targeting_limit = dc_sg_targeting_limit.split(MODEL_LIST_DELIMITER)
480480
else:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -895,7 +895,7 @@ def __validate_server_group_targeting_limits(self, attribute_key, attribute_valu
895895
else:
896896
model_folder_path += '/' + attribute_key
897897
for key, value in attribute_value.iteritems():
898-
if type(key) is not str:
898+
if not isinstance(key, basestring):
899899
# Force the key to a string for any value validation issues reported below
900900
key = str_helper.to_string(key)
901901
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
912912
for element in value:
913913
self._validate_single_server_group_target_limits_value(key, element,
914914
model_folder_path)
915-
elif type(value) is str:
915+
elif isinstance(value, basestring):
916916
self._validate_single_server_group_target_limits_value(key, value, model_folder_path)
917917
else:
918918
self._logger.severe('WLSDPLY-05034', key, model_folder_path,

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
"12.2.1.3": "JRF_12CR2",
1414
"12.2.1.4": "JRF_12CR2_LAST",
1515
"12.2.1.5": "JRF_12CR2_LAST",
16-
"14.1": "NOT_SUPPORTED"
16+
"14.1": "NOT_SUPPORTED",
17+
"14.1.2": "JRF_14"
1718
},
1819
"definitions": {
1920
"JRF_12CR2_FIRST": {
@@ -51,6 +52,18 @@
5152
"customExtensionTemplates": [ ],
5253
"serverGroupsToTarget": [ ],
5354
"rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
55+
},
56+
"JRF_14": {
57+
"baseTemplate": "Basic WebLogic Server Domain",
58+
"extensionTemplates": [
59+
"Oracle JRF",
60+
"Oracle JRF WebServices Asynchronous services",
61+
"Oracle WSM Policy Manager",
62+
"Oracle Enterprise Manager"
63+
],
64+
"customExtensionTemplates": [ ],
65+
"serverGroupsToTarget": [ ],
66+
"rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
5467
}
5568
},
5669
"discover-filters": {

‎core/src/main/typedefs/JRF.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
"12.2.1.3": "JRF_12CR2",
1313
"12.2.1.4": "JRF_12CR2_LAST",
1414
"12.2.1.5": "JRF_12CR2_LAST",
15-
"14.1": "NOT_SUPPORTED"
15+
"14.1.1" : "NOT_SUPPORTED",
16+
"14.1.2": "JRF_14"
1617
},
1718
"definitions": {
1819
"JRF_11G" : {
@@ -88,6 +89,19 @@
8889
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
8990
"dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER", "WSM-CACHE-DYN-CLUSTER" ],
9091
"rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
92+
},
93+
"JRF_14": {
94+
"baseTemplate": "Basic WebLogic Server Domain",
95+
"extensionTemplates": [
96+
"Oracle JRF",
97+
"Oracle JRF WebServices Asynchronous services",
98+
"Oracle WSM Policy Manager",
99+
"Oracle Enterprise Manager"
100+
],
101+
"customExtensionTemplates": [ ],
102+
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSMPM-MAN-SVR" ],
103+
"dynamicClusterServerGroupsToTarget" : [ "WSMPM-DYN-CLUSTER", "WSM-CACHE-DYN-CLUSTER" ],
104+
"rcuSchemas": [ "MDS", "IAU", "IAU_VIEWER", "IAU_APPEND", "OPSS", "STB", "WLS" ]
91105
}
92106
},
93107
"discover-filters": {

‎core/src/main/typedefs/RestrictedJRF.json

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,34 @@
1010
"12.2.1.3": "RJRF_12CR2",
1111
"12.2.1.4": "RJRF_12CR2",
1212
"12.2.1.5": "RJRF_12CR2",
13-
"14.1.1": "NOT_SUPPORTED"
13+
"14.1.1": "NOT_SUPPORTED",
14+
"14.1.2": "RJRF_14"
1415
},
1516
"definitions": {
1617
"RJRF_12CR2_FIRST": {
1718
"baseTemplate": "Basic WebLogic Server Domain",
1819
"extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
1920
"customExtensionTemplates": [ ],
20-
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"],
21+
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
2122
"rcuSchemas": [ ]
2223
},
2324
"RJRF_12CR2": {
2425
"baseTemplate": "Basic WebLogic Server Domain",
2526
"extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
2627
"customExtensionTemplates": [ ],
27-
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"],
28+
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR"] ,
29+
"dynamicClusterServerGroupsToTarget" : [ "WSM-CACHE-DYN-CLUSTER" ],
30+
"rcuSchemas": [ ]
31+
},
32+
"RJRF_14": {
33+
"baseTemplate": "Basic WebLogic Server Domain",
34+
"extensionTemplates": [ "Oracle Restricted JRF", "Oracle Enterprise Manager-Restricted JRF" ],
35+
"customExtensionTemplates": [ ],
36+
"serverGroupsToTarget": [ "JRF-MAN-SVR", "WSM-CACHE-SVR", "JRF-WS-CORE-MAN-SVR" ],
2837
"dynamicClusterServerGroupsToTarget" : [ "WSM-CACHE-DYN-CLUSTER" ],
2938
"rcuSchemas": [ ]
3039
}
40+
3141
},
3242
"discover-filters": {
3343
"/Application": [

‎core/src/test/python/alias_json_file_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ def _verify_attribute_wlst_type_attribute_value(self, folder_name, attribute_nam
704704
def _verify_boolean_value(self, folder_name, attribute_name, alias_attribute_name, alias_attribute_value):
705705
result = []
706706
constrained_string_values = ['true', 'false']
707-
if type(alias_attribute_value) is str:
707+
if isinstance(alias_attribute_value, basestring):
708708
if alias_attribute_value.lower() not in constrained_string_values:
709709
result.append(self._get_invalid_attribute_boolean_string_value_message(folder_name, attribute_name,
710710
alias_attribute_name,

0 commit comments

Comments
 (0)