Skip to content

Commit d55a8a4

Browse files
robertpatrickrobertpatrick
committed
Merge branch 'alias-updates-9-24-2024' into 'main'
Alias updates for current and future WLS versions See merge request weblogic-cloud/weblogic-deploy-tooling!1738
2 parents f9d9d83 + 95e3147 commit d55a8a4

File tree

4 files changed

+27
-10
lines changed

4 files changed

+27
-10
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,8 +327,9 @@
327327
"ReportGroupFile": [ {"version": "[12.1.3,12.2.1)", "wlst_mode": "both", "wlst_name": "ReportGroupFile", "wlst_path": "WP001", "default_value": "em/coherence/report-group.xml", "wlst_type": "string", "uses_path_tokens": "true" },
328328
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ReportGroupFile", "wlst_path": "WP001", "default_value": "em/metadata/reports/coherence/report-group.xml", "wlst_type": "string", "uses_path_tokens": "true" }],
329329
"SourcePath": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "default_value": null, "derived_default": "${:true}", "wlst_type": "string", "uses_path_tokens": "true" } ],
330-
"Target": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
331-
{"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
330+
"Target": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "default_value": null, "wlst_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans" },
331+
{"version": "[12.1.2,12.2.1.1)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean", "derived_default": true},
332+
{"version": "[12.2.1.1,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "default_value": null, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
332333
"UsingCustomClusterConfigurationFile": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "UsingCustomClusterConfigurationFile", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ]
333334
},
334335
"wlst_attributes_path": "WP001",

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1718,7 +1718,10 @@
17181718
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "AdministrationPortEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "${LSA:GET}", "derived_default": "${:true}" },
17191719
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationPortEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "${LSA:GET}", "derived_default": true }
17201720
],
1721-
"AdministrationProtocol": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:t3s}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true" } ],
1721+
"AdministrationProtocol": [
1722+
{"version": "[10,14.1.2)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:t3s}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true" },
1723+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "t3s", "derived_default": true, "wlst_type": "string", "restart_required": "true" }
1724+
],
17221725
"AllowShrinkingPriorityRequestQueue": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowShrinkingPriorityRequestQueue", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "restart_required": "true" } ],
17231726
"AutoJDBCConnectionClose": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "AutoJDBCConnectionClose", "wlst_path": "WP001", "default_value": "false", "wlst_type": "string" } ],
17241727
"AutoKillIfFailed": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AutoKillIfFailed", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
@@ -1729,7 +1732,10 @@
17291732
"BuzzPort": [ {"version": "[12.2.1,14.1.2)", "wlst_mode": "both", "wlst_name": "BuzzPort", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "restart_required": "true" } ],
17301733
"COMEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "COMEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17311734
"CandidateMachine": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CandidateMachine${:s}", "wlst_path": "WP001", "default_value": "${__NULL__:[]}", "wlst_type": "${delimited_string:jarray}", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_machine_mbean", "set_mbean_type": "weblogic.management.configuration.MachineMBean" } ],
1732-
"ClasspathServletDisabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1735+
"ClasspathServletDisabled": [
1736+
{"version": "[10,12.2.1.3)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "secure_default": "${:true}" },
1737+
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
1738+
],
17331739
"ClasspathServletSecureModeEnabled": [
17341740
{"version": "[12.2.1.3,12.2.1.3.0.221013)", "wlst_mode": "offline", "wlst_name": "ClasspathServletSecureModeEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" },
17351741
{"version": "[12.2.1.3.0.221013,12.2.1.4)", "wlst_mode": "offline", "wlst_name": "ClasspathServletSecureModeEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" },

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,10 @@
17381738
{"version": "[12.1.2,14.1.2)", "wlst_mode": "both", "wlst_name": "AdministrationPortEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "${LSA:GET}", "derived_default": "${:true}" },
17391739
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationPortEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean", "get_method": "${LSA:GET}", "derived_default": true }
17401740
],
1741-
"AdministrationProtocol": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:t3s}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true" } ],
1741+
"AdministrationProtocol": [
1742+
{"version": "[12.1.2,14.1.2)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "${__NULL__:t3s}", "derived_default": "${:true}", "wlst_type": "string", "restart_required": "true" },
1743+
{"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "AdministrationProtocol", "wlst_path": "WP001", "default_value": "t3s", "derived_default": true, "wlst_type": "string", "restart_required": "true" }
1744+
],
17421745
"AllowShrinkingPriorityRequestQueue": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowShrinkingPriorityRequestQueue", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "restart_required": "true" } ],
17431746
"AutoJDBCConnectionClose": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "AutoJDBCConnectionClose", "wlst_path": "WP001", "default_value": "false", "wlst_type": "string" } ],
17441747
"AutoKillIfFailed": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AutoKillIfFailed", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
@@ -1749,7 +1752,10 @@
17491752
"BuzzPort": [ {"version": "[12.2.1,14.1.2)", "wlst_mode": "both", "wlst_name": "BuzzPort", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer", "restart_required": "true" } ],
17501753
"COMEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "COMEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
17511754
"CandidateMachine": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CandidateMachine${:s}", "wlst_path": "WP001", "default_value": "${__NULL__:[]}", "wlst_type": "${delimited_string:jarray}", "get_method": "${LSA:GET}", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_machine_mbean", "set_mbean_type": "weblogic.management.configuration.MachineMBean"} ],
1752-
"ClasspathServletDisabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
1755+
"ClasspathServletDisabled": [
1756+
{"version": "[12.1.2,12.2.1.3)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "secure_default": "${:true}" },
1757+
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
1758+
],
17531759
"ClasspathServletSecureModeEnabled": [
17541760
{"version": "[12.2.1.3,12.2.1.3.0.221013)", "wlst_mode": "offline", "wlst_name": "ClasspathServletSecureModeEnabled", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean" },
17551761
{"version": "[12.2.1.3.0.221013,12.2.1.4)", "wlst_mode": "offline", "wlst_name": "ClasspathServletSecureModeEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" },

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
'12.1.2.0.0',
5656
'12.1.3.0.0'
5757
]
58+
SECURE_DEFAULT_DISMISS = [
59+
'12.2.1.0.0' # possible problems with @secureValueDocOnly
60+
]
5861
LSA_DEFAULT = 'lsa_default'
5962
LSA_TYPE = 'lsa_wlst_type'
6063
READ_ONLY = generator_utils.READ_ONLY
@@ -107,10 +110,11 @@ def add_computed_defaults(self, dictionary, cmo_helper, attribute_name):
107110
dictionary[PRODUCTION_DEFAULT] = self.convert_attribute(attribute_name, production_default_value,
108111
value_type=dictionary[GET_TYPE])
109112

110-
secure_default_value = cmo_helper.secure_default_value()
111-
if secure_default_value is not None:
112-
dictionary[SECURE_DEFAULT] = self.convert_attribute(attribute_name, secure_default_value,
113-
value_type=dictionary[GET_TYPE])
113+
if self._model_context.get_local_wls_version() not in SECURE_DEFAULT_DISMISS:
114+
secure_default_value = cmo_helper.secure_default_value()
115+
if secure_default_value is not None:
116+
dictionary[SECURE_DEFAULT] = self.convert_attribute(attribute_name, secure_default_value,
117+
value_type=dictionary[GET_TYPE])
114118

115119
self.__logger.exiting(class_name=self.__class_name, method_name=_method_name, result={
116120
DERIVED_DEFAULT: derived_default_value,

0 commit comments

Comments
 (0)