Skip to content

Commit 2326e3f

Browse files
committed
Merge branch 'resource-management-attribute-4.0' into 'develop-4.0'
Ignore /ResourceManagement attribute in WLS 14.1.1 and higher - 4.0 See merge request weblogic-cloud/weblogic-deploy-tooling!1634
2 parents 70b86ba + 119629f commit 2326e3f

File tree

2 files changed

+4
-0
lines changed
  • core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules
  • integration-tests/alias-test/verify/src/test/python/aliastest/verify

2 files changed

+4
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
{"version": "[14,)", "wlst_mode": "online", "wlst_name": "PartitionUriSpace", "wlst_path": "WP001", "default_value": "/partitions", "wlst_type": "string" } ],
5757
"ProductionModeEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ProductionModeEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
5858
"RemoteConsoleHelperEnabled": [ {"version": "[14.1.2,)", "wlst_mode": "both", "wlst_name": "RemoteConsoleHelperEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
59+
"ResourceManagement": [ {"version": "[14.1.1,)", "wlst_mode": "online", "wlst_name": "ResourceManagement", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "comment": "Appears in attribute list since ResourceManagement folder is no longer created"} ],
5960
"RootDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RootDirectory", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED", "uses_path_tokens": "true"} ],
6061
"ServerMigrationHistorySize": [ {"version": "[12.1.2,12.2.1.1)", "wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "default_value": "-1", "wlst_type": "integer", "restart_required": "true" },
6162
{"version": "[12.2.1.1,12.2.1.3)","wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "default_value": "-1", "wlst_type": "integer" } ,

integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
}
3535

3636
ONLINE_ALIAS_ATTRIBUTE_IGNORE_MAP = {
37+
'/': [
38+
'ResourceManagement' # appears in attribute list since folder MBean is no longer created
39+
],
3740
'/Cluster/OverloadProtection': [
3841
'ServerFailureTrigger' # appears in attribute list until folder MBean is created
3942
],

0 commit comments

Comments
 (0)