Skip to content

Commit d7a10eb

Browse files
rakillenrakillen
authored
Correct Ciphersuite alias to set and discover list value correctly (#764)
* JIRA WDT-497 - Correct Ciphersuite alias to set and discover list value correctly * JIRA WDT-497 - Correct Ciphersuite in ServerTemplate and Server / NetworkAccessPoint * JIRA WDT-497 - Updated unit test to expect list for setting value
1 parent f576e9a commit d7a10eb

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
"AllowUnencryptedNullCipher": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowUnencryptedNullCipher", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
289289
"ChannelIdentityCustomized": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ChannelIdentityCustomized", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
290290
"ChannelWeight": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ChannelWeight", "wlst_path": "WP001", "value": {"default": 50 }, "wlst_type": "integer" } ],
291-
"Ciphersuite": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "" }, "wlst_type": "delimited_string", "get_method": "LSA"} ],
291+
"Ciphersuite": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
292292
"ClientCertificateEnforced": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
293293
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
294294
"ClusterAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterAddress", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "${LSA:GET}" } ],
@@ -1028,7 +1028,7 @@
10281028
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "CertAuthenticator", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
10291029
"CertificateCacheSize": [ {"version": "[10,12.2.1)", "wlst_mode": "offline", "wlst_name": "CertificateCacheSize", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer", "get_method": "LSA", "restart_required": "true" } ,
10301030
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "CertificateCacheSize", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer", "get_method": "GET", "restart_required": "true" } ],
1031-
"Ciphersuite": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "" }, "wlst_type": "delimited_string", "preferred_model_type": "list", "get_method": "LSA" } ],
1031+
"Ciphersuite": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
10321032
"ClientCertAlias": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "ClientCertAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
10331033
"ClientCertPrivateKeyPassPhraseEncrypted": [ {"version": "[10.3.6,)", "wlst_mode": "both", "wlst_name": "ClientCertPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
10341034
"ClientCertificateEnforced": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@
297297
"AllowUnencryptedNullCipher": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowUnencryptedNullCipher", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
298298
"ChannelIdentityCustomized": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ChannelIdentityCustomized", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
299299
"ChannelWeight": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ChannelWeight", "wlst_path": "WP001", "value": {"default": 50 }, "wlst_type": "integer" } ],
300-
"Ciphersuite": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string" } ],
300+
"Ciphersuite": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
301301
"ClientCertificateEnforced": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
302302
"ClientInitSecureRenegotiationAccepted": [ {"version": "[12.2.1.3,)","wlst_mode": "both", "wlst_name": "ClientInitSecureRenegotiationAccepted", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
303303
"ClusterAddress": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClusterAddress", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1040,7 +1040,7 @@
10401040
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "CertAuthenticator", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
10411041
"CertificateCacheSize": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "offline", "wlst_name": "CertificateCacheSize", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer", "get_method": "LSA", "restart_required": "true" } ,
10421042
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "CertificateCacheSize", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer", "get_method": "GET", "restart_required": "true" } ],
1043-
"Ciphersuite": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA"} ],
1043+
"Ciphersuite": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Ciphersuite${:s}", "wlst_path": "WP001", "value": {"default": "" }, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "preferred_model_type": "list", "get_method": "${LSA:GET}" } ],
10441044
"ClientCertAlias": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
10451045
"ClientCertPrivateKeyPassPhraseEncrypted": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],
10461046
"ClientCertificateEnforced": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClientCertificateEnforced", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,15 +1233,16 @@ def testListGetToList(self):
12331233
location.add_name_token(self.aliases.get_name_token(location), 'AdminServer')
12341234
location = location.append_location(FOLDERS.SSL)
12351235
location.add_name_token(self.aliases.get_name_token(location), 'AdminServer')
1236-
wlst_list = "TLS,WITH_AES_256_CBC"
1236+
wlst_list = "TLS;WITH_AES_256_CBC"
12371237
expected_wlst_list = ['TLS', 'WITH_AES_256_CBC']
1238+
expected_wlst_set_list = ['TLS', 'WITH_AES_256_CBC']
12381239
attribute = 'Ciphersuite'
12391240

12401241
actual_attr, actual_value = self.aliases.get_model_attribute_name_and_value(location, attribute, wlst_list)
12411242
self.assertEqual(expected_wlst_list, actual_value)
12421243

12431244
actual_attr, actual_value = self.aliases.get_wlst_attribute_name_and_value(location, actual_attr, actual_value)
1244-
self.assertEqual(wlst_list, actual_value)
1245+
self.assertEqual(expected_wlst_set_list, actual_value)
12451246

12461247
def testGetJTA(self):
12471248
location = LocationContext()

0 commit comments

Comments
 (0)