Skip to content

Commit

Permalink
Merge branch 'jira-wdt-923-discover-cleanup' into 'main'
Browse files Browse the repository at this point in the history 
Fix more alias test failures from deprecated attributes

See merge request weblogic-cloud/weblogic-deploy-tooling!1764
  • Loading branch information
@robertpatrick
robertpatrick committed Jan 7, 2025
2 parents dd9c3e6 + e96313e commit 45156de
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 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 @@ -1384,6 +1384,7 @@
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase${Encrypted:}", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:IGNORED}", "derived_default": "${:true}", "secret_suffix": "outboundprivatekey" },
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:IGNORED}", "derived_default": "${:true}", "secret_suffix": "outboundprivatekey" }
],
"PeerValidationEnforced": [ {"version": "[10,12.2.1)", "wlst_mode": "online", "wlst_name": "PeerValidationEnforced", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
"SSLRejectionLoggingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
"ServerCertificateChainFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],
"ServerCertificateFileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ],
Expand Down Expand Up @@ -1779,6 +1780,7 @@
"CleanupOrphanedSessionsEnabled": [ {"version": "[12.2.1.4,)", "wlst_mode": "both", "wlst_name": "CleanupOrphanedSessionsEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
"ClientCertProxyEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertProxyEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
"Cluster": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Cluster", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "${MBEAN.set_server_cluster_mbean:MBEAN.set_cluster_mbean}", "set_mbean_type": "weblogic.management.configuration.ClusterMBean" } ],
"ClusterRuntime": [ {"version": "[10,12.1.2)", "wlst_mode": "online", "wlst_name": "ClusterRuntime", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"ClusterWeight": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterWeight", "wlst_path": "WP001", "default_value": 100, "wlst_type": "integer" } ],
"CoherenceClusterSystemResource": [ {"version": "[10,)", "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" } ],
"CompleteCOMMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteCOMMessageTimeout", "wlst_path": "WP001", "default_value": -1, "wlst_type": "integer" } ],
Expand Down
1 change: 1 addition & 0 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 @@ -1388,6 +1388,7 @@
{"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhrase${Encrypted:}", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:IGNORED}", "secret_suffix": "outboundprivatekey" },
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "OutboundPrivateKeyPassPhraseEncrypted", "wlst_path": "WP001", "default_value": null, "wlst_type": "password", "access": "${:IGNORED}", "secret_suffix": "outboundprivatekey", "derived_default": "${:true}" }
],
"PeerValidationEnforced": [ {"version": "[12.1.2,12.2.1)", "wlst_mode": "online", "wlst_name": "PeerValidationEnforced", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
"SSLRejectionLoggingEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SSLRejectionLoggingEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
"ServerCertificateChainFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateChainFileName", "wlst_path": "WP001", "default_value": "server-certchain.pem", "wlst_type": "string" } ],
"ServerCertificateFileName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ServerCertificateFileName", "wlst_path": "WP001", "default_value": "server-cert.der", "wlst_type": "string" } ],
Expand Down
5 changes: 4 additions & 1 deletion core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/XMLEntityCache.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"copyright": "Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.",
"copyright": "Copyright (c) 2017, 2025, Oracle and/or its affiliates.",
"license": "Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl",
"wlst_type": "XMLEntityCache${:s}",
"online_bean": "weblogic.management.configuration.XMLEntityCacheMBean",
Expand All @@ -11,6 +11,9 @@
"CacheLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheLocation", "wlst_path": "WP001", "default_value": "xmlcache", "wlst_type": "string" } ],
"CacheMemorySize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheMemorySize", "wlst_path": "WP001", "default_value": 500, "wlst_type": "integer" } ],
"CacheTimeoutInterval": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CacheTimeoutInterval", "wlst_path": "WP001", "default_value": 120, "wlst_type": "integer" } ],
"EntityCacheCurrentRuntime": [ {"version": "[10,12.1.2)", "wlst_mode": "online", "wlst_name": "EntityCacheCurrentRuntime", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"EntityCacheHistoricalRuntime": [ {"version": "[10,12.1.2)", "wlst_mode": "online", "wlst_name": "EntityCacheHistoricalRuntime", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"EntityCacheSessionRuntime": [ {"version": "[10,12.1.2)", "wlst_mode": "online", "wlst_name": "EntityCacheSessionRuntime", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
"MaxSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxSize", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer" } ],
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ]
},
Expand Down
1 change: 1 addition & 0 deletions integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
'ServerFailureTrigger' # appears in attribute list until folder MBean is created
],
'/Server': [
'ClusterRuntime', # an MBean from older versions of WLS
'JTAMigratableTarget' # appears in attribute list until folder MBean is created
],
'/Server/OverloadProtection': [
Expand Down
5 changes: 5 additions & 0 deletions integration-tests/alias-test/verify/src/test/python/aliastest/verify/verifier.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,11 @@ def _verify_attributes_at_location(self, generated_attributes, location):

if generated_attributes:
for generated_attribute in generated_attributes:
if verify_utils.is_alias_attribute_in_ignore_list(self._model_context, location, generated_attribute):
# don't remove from the unprocessed alias list, process later from that list.
# we don't need to omit these from the generated file any longer.
continue

if generated_attribute in unprocessed_alias_list:
unprocessed_alias_list.remove(generated_attribute)

Expand Down

0 comments on commit 45156de

Please sign in to comment.