Skip to content

Commit

Permalink
Merge branch 'alias-updates-9-24-2024' into 'main'
Browse files Browse the repository at this point in the history 
Alias updates for current and future WLS versions

See merge request weblogic-cloud/weblogic-deploy-tooling!1738
  • Loading branch information
@robertpatrick
robertpatrick committed Sep 24, 2024
2 parents f9d9d83 + 95e3147 commit d55a8a4
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 10 deletions.
5 changes: 3 additions & 2 deletions ...urces/oracle/weblogic/deploy/aliases/category_modules/CoherenceClusterSystemResource.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,9 @@
"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" },
{"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" }],
"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" } ],
"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" },
{"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"} ],
"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" },
{"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},
{"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"} ],
"UsingCustomClusterConfigurationFile": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "UsingCustomClusterConfigurationFile", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ]
},
"wlst_attributes_path": "WP001",
Expand Down
10 changes: 8 additions & 2 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1718,7 +1718,10 @@
{"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}" },
{"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 }
],
"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" } ],
"AdministrationProtocol": [
{"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" },
{"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" }
],
"AllowShrinkingPriorityRequestQueue": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowShrinkingPriorityRequestQueue", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "restart_required": "true" } ],
"AutoJDBCConnectionClose": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "AutoJDBCConnectionClose", "wlst_path": "WP001", "default_value": "false", "wlst_type": "string" } ],
"AutoKillIfFailed": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AutoKillIfFailed", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
Expand All @@ -1729,7 +1732,10 @@
"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" } ],
"COMEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "COMEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
"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" } ],
"ClasspathServletDisabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
"ClasspathServletDisabled": [
{"version": "[10,12.2.1.3)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "secure_default": "${:true}" },
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
],
"ClasspathServletSecureModeEnabled": [
{"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" },
{"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" },
Expand Down
10 changes: 8 additions & 2 deletions core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1738,7 +1738,10 @@
{"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}" },
{"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 }
],
"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" } ],
"AdministrationProtocol": [
{"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" },
{"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" }
],
"AllowShrinkingPriorityRequestQueue": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AllowShrinkingPriorityRequestQueue", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean", "restart_required": "true" } ],
"AutoJDBCConnectionClose": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "AutoJDBCConnectionClose", "wlst_path": "WP001", "default_value": "false", "wlst_type": "string" } ],
"AutoKillIfFailed": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "AutoKillIfFailed", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
Expand All @@ -1749,7 +1752,10 @@
"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" } ],
"COMEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "COMEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
"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"} ],
"ClasspathServletDisabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
"ClasspathServletDisabled": [
{"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}" },
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ClasspathServletDisabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" }
],
"ClasspathServletSecureModeEnabled": [
{"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" },
{"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" },
Expand Down
12 changes: 8 additions & 4 deletions integration-tests/alias-test/generate/src/test/python/aliastest/generate/generator_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@
'12.1.2.0.0',
'12.1.3.0.0'
]
SECURE_DEFAULT_DISMISS = [
'12.2.1.0.0' # possible problems with @secureValueDocOnly
]
LSA_DEFAULT = 'lsa_default'
LSA_TYPE = 'lsa_wlst_type'
READ_ONLY = generator_utils.READ_ONLY
Expand Down Expand Up @@ -107,10 +110,11 @@ def add_computed_defaults(self, dictionary, cmo_helper, attribute_name):
dictionary[PRODUCTION_DEFAULT] = self.convert_attribute(attribute_name, production_default_value,
value_type=dictionary[GET_TYPE])

secure_default_value = cmo_helper.secure_default_value()
if secure_default_value is not None:
dictionary[SECURE_DEFAULT] = self.convert_attribute(attribute_name, secure_default_value,
value_type=dictionary[GET_TYPE])
if self._model_context.get_local_wls_version() not in SECURE_DEFAULT_DISMISS:
secure_default_value = cmo_helper.secure_default_value()
if secure_default_value is not None:
dictionary[SECURE_DEFAULT] = self.convert_attribute(attribute_name, secure_default_value,
value_type=dictionary[GET_TYPE])

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

0 comments on commit d55a8a4

Please sign in to comment.