Skip to content

Commit e9e307e

Browse files
rakillenrakillen
committed
Stop treating lsa 'none' as None in alias tests
1 parent 155f2d4 commit e9e307e

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2023, Oracle Corporation and/or its affiliates.",
2+
"copyright": "Copyright (c) 2017, 2024, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "Cluster${:s}",
55
"online_bean": "weblogic.management.configuration.ClusterMBean",
@@ -184,7 +184,7 @@
184184
"ClusterBroadcastChannel": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterBroadcastChannel", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
185185
"ClusterMessagingMode": [ {"version": "[10,12.1.1)", "wlst_mode": "both", "wlst_name": "ClusterMessagingMode", "wlst_path": "WP001", "default_value": "${unicast:multicast}", "wlst_type": "string" } ,
186186
{"version": "[12.1.1,)", "wlst_mode": "both", "wlst_name": "ClusterMessagingMode", "wlst_path": "WP001", "default_value": "unicast", "wlst_type": "string" } ],
187-
"ClusterType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "restart_required": "true" } ],
187+
"ClusterType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterType", "wlst_path": "WP001", "default_value": "${__NULL__:none}", "wlst_type": "string", "restart_required": "true" } ],
188188
"CoherenceClusterSystemResource": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceClusterSystemResource", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "${LSA:GET}","set_method": "${:MBEAN.set_coherence_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.CoherenceClusterSystemResourceMBean}", "restart_required": "true" } ],
189189
"ConcurrentSingletonActivationEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ConcurrentSingletonActivationEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
190190
"ConsensusParticipants": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConsensusParticipants", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "get_method": "GET" } ],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2024, Oracle Corporation and/or its affiliates.",
2+
"copyright": "Copyright (c) 2017, 2024, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "CoherenceClusterSystemResource${:s}",
55
"online_bean": "weblogic.management.configuration.CoherenceClusterSystemResourceMBean",
@@ -218,7 +218,7 @@
218218
"default_name_value": "${NO_NAME_0:%COHERENCECLUSTER%}",
219219
"folders": {},
220220
"attributes": {
221-
"FederationTopology": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationTopology", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
221+
"FederationTopology": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationTopology", "wlst_path": "WP001", "default_value": "${__NULL__:none}", "wlst_type": "string" } ],
222222
"RemoteCoherenceClusterListenPort": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "RemoteCoherenceClusterListenPort", "wlst_path": "WP001", "default_value": "${__NULL__:7574}", "wlst_type": "integer"} ],
223223
"RemoteCoherenceClusterName": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "RemoteCoherenceClusterName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
224224
"RemoteParticipantHost": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "RemoteParticipantHost${:s}", "wlst_path": "WP001", "default_value": null, "wlst_type": "${list:jarray}", "wlst_read_type": "delimited_string[semicolon]", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string" } ]
@@ -312,7 +312,7 @@
312312
"FederationRemoteClusterListenPort": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationRemoteClusterListenPort", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "access": "IGNORED" } ],
313313
"FederationRemoteClusterName": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationRemoteClusterName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
314314
"FederationRemoteParticipantHost": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationRemoteParticipantHost${:s}","wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
315-
"FederationTopology": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationTopology", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
315+
"FederationTopology": [ {"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "FederationTopology", "wlst_path": "WP001", "default_value": "${__NULL__:none}", "wlst_type": "string", "access": "IGNORED" } ],
316316
"ModuleType": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
317317
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
318318
"PartitionName": [ {"version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "PartitionName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "GET", "access": "IGNORED" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"copyright": "Copyright (c) 2017, 2024, Oracle Corporation and/or its affiliates.",
2+
"copyright": "Copyright (c) 2017, 2024, Oracle and/or its affiliates.",
33
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
44
"wlst_type": "",
55
"online_bean": "weblogic.management.configuration.DomainMBean",
@@ -18,7 +18,7 @@
1818
"BatchJobsExecutorServiceName": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "BatchJobsExecutorServiceName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
1919
"ClusterConstraintsEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterConstraintsEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
2020
"ConfigBackupEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigBackupEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
21-
"ConfigurationAuditType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationAuditType", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
21+
"ConfigurationAuditType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationAuditType", "wlst_path": "WP001", "default_value": "${__NULL__:none}", "wlst_type": "string" } ],
2222
"ConfigurationVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConfigurationVersion", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
2323
"ConsoleContextPath": [
2424
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "ConsoleContextPath", "wlst_path": "WP001", "default_value": "console", "wlst_type": "string", "uses_path_tokens": "true" },

‎integration-tests/alias-test/generate/src/test/python/aliastest/generate/generator_wlst.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
"""
2-
Copyright (c) 2021, 2022, Oracle Corporation and/or its affiliates.
2+
Copyright (c) 2021, 2024, Oracle and/or its affiliates.
33
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
"""
55
import re
@@ -452,7 +452,8 @@ def lsa_map():
452452
value = entry.getValue()
453453
if value and isinstance(value, basestring):
454454
new_value = value.rstrip()
455-
if new_value == 'null' or new_value == 'none':
455+
# 'none' was previously mapped to None, interfered with RotationType 'none'
456+
if new_value == 'null':
456457
make_dict[key] = None
457458
else:
458459
make_dict[key] = new_value
@@ -476,7 +477,8 @@ def lsa_map_modified():
476477
value = entry.getValue()
477478
if value and isinstance(value, basestring):
478479
new_value = value.rstrip()
479-
if new_value == 'null' or new_value == 'none':
480+
# 'none' was previously mapped to None, interfered with RotationType 'none'
481+
if new_value == 'null':
480482
make_dict[key] = None
481483
else:
482484
make_dict[key] = new_value

0 commit comments

Comments
 (0)