From fb2f1ad32576536aa8ee69b76144fdee53b97b37 Mon Sep 17 00:00:00 2001 From: rkillen Date: Thu, 12 Jul 2018 13:47:37 -0500 Subject: [PATCH 1/4] Issue #132 - Change ConfigurationProperty to multiple; fixed typos in ServerTemplate alias --- .../weblogic/deploy/aliases/category_modules/Server.json | 1 + .../deploy/aliases/category_modules/ServerTemplate.json | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index eecafa6553..8fa432b1c8 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -46,6 +46,7 @@ } }, "ConfigurationProperty" : { + "child_folders_type": "multiple", "version" : "[12.2.1,)", "folders" : {}, "attributes" : { diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index 67c481c36a..3b2a3b0edf 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -47,6 +47,7 @@ } }, "ConfigurationProperty" : { + "child_folders_type": "multiple", "version" : "[12.2.1,)", "folders" : {}, "attributes" : { @@ -59,7 +60,7 @@ "wlst_type" : "ConfigurationPropert${y:ies}", "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%" } }, "DataSource": { @@ -342,7 +343,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/${NO_NAME_0:%SERVERTEMPLATE%}/ServerFailureTrigger/${NO_NAME_0:%SERVER%}" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/${NO_NAME_0:%SERVERTEMPLATE%}/ServerFailureTrigger/${NO_NAME_0:%SERVERTEMPLATE%}" } } }, @@ -1062,7 +1063,7 @@ "wlst_attributes_path": "WP001", "wlst_paths": { "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/TransactionLogJDBCStore/${NO_NAME_0:%SERVERTEMPLATE%}", - "WP003": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/${NO_NAME_0:%SERVERTEMPLATE%}/Targets" + "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/${NO_NAME_0:%SERVERTEMPLATE%}/Targets" } }, "WebServer": { @@ -1201,7 +1202,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/${NO_NAME_0:%SERVERTEMPLATE%}/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}%" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/${NO_NAME_0:%SERVERTEMPLATE%}/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}" } }, "WebServiceBuffering": { From 6a6fd3944755eceaf384c05d6adad53fb9dddff3 Mon Sep 17 00:00:00 2001 From: rkillen Date: Thu, 12 Jul 2018 15:35:25 -0500 Subject: [PATCH 2/4] Issue #132 - Change some folders to single/unpredictable naming --- .../aliases/category_modules/Server.json | 36 +++++++++++++------ .../category_modules/ServerTemplate.json | 35 ++++++++++++------ 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index 8fa432b1c8..5ff9c8e294 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -30,6 +30,8 @@ }, "COM": { "wlst_type": "COM", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "ApartmentThreaded": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApartmentThreaded", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ], @@ -42,7 +44,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/COM/%SERVER%" + "WP001": "/Server${:s}/%SERVER%/COM/%SERVER_COM%" } }, "ConfigurationProperty" : { @@ -82,6 +84,8 @@ }, "DefaultFileStore": { "wlst_type": "DefaultFileStore", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "BlockSize": [ {"version": "[10,10.3.4)", "wlst_mode": "both", "wlst_name": "BlockSize", "wlst_path": "WP001", "value": {"default": "${512:-1}" }, "wlst_type": "integer", "access": "${:RO}"}, @@ -99,7 +103,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/DefaultFileStore/${NO_NAME_0:%SERVER%}" + "WP001": "/Server${:s}/%SERVER%/DefaultFileStore/%SERVER_DEFAULTFILESTORE%" } }, "ExecuteQueue": { @@ -159,6 +163,8 @@ }, "IIOP": { "wlst_type": "IIOP", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ], @@ -180,7 +186,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/IIOP/%SERVER%" + "WP001": "/Server${:s}/%SERVER%/IIOP/%SERVE_IIOP%" } }, "JTAMigratableTarget": { @@ -213,6 +219,8 @@ }, "Log": { "wlst_type": "Log", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeKb", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer"} ], @@ -257,7 +265,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/Log/%SERVER%" + "WP001": "/Server${:s}/%SERVER%/Log/%SERVER_LOG%" } }, "NetworkAccessPoint": { @@ -361,6 +369,8 @@ }, "ServerDebug": { "wlst_type": "ServerDebug", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "ApplicationContainer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationContainer", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ], @@ -852,7 +862,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER%" + "WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER_DEBUG%" } }, "ServerDiagnosticConfig": { @@ -894,6 +904,8 @@ }, "ServerStart": { "wlst_type": "ServerStart", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "Arguments": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Arguments", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string[space]" } ], @@ -911,7 +923,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER%" + "WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER_START%" } }, "SingleSignOnServices" : { @@ -971,6 +983,8 @@ }, "SSL": { "wlst_type": "SSL", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": {}, "attributes": { "AcceptKssDemoCertsEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AcceptKssDemoCertsEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ], @@ -1017,7 +1031,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/SSL/%SERVER%" + "WP001": "/Server${:s}/%SERVER%/SSL/%SERVER_SSL%" } }, "TransactionLogJDBCStore": { @@ -1065,6 +1079,8 @@ }, "WebServer": { "wlst_type": "WebServer", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVER%}", "folders": { "WebServerLog": { "wlst_type": "WebServerLog", @@ -1093,7 +1109,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER%/WebServerLog/%WEBSERVERLOG%" + "WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/WebServerLog/%WEBSERVERLOG%" } } }, @@ -1132,8 +1148,8 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER%", - "WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER%/Targets" + "WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%", + "WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/Targets" } }, "WebService": { diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index 3b2a3b0edf..56a40a4b2f 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -31,6 +31,8 @@ }, "COM": { "wlst_type": "COM", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": {}, "attributes": { "ApartmentThreaded": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApartmentThreaded", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ], @@ -43,7 +45,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE%" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE_COM%" } }, "ConfigurationProperty" : { @@ -83,6 +85,8 @@ }, "DefaultFileStore": { "wlst_type": "DefaultFileStore", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": {}, "attributes": { "BlockSize": [ {"version": "[10,10.3.4)", "wlst_mode": "both", "wlst_name": "BlockSize", "wlst_path": "WP001", "value": {"default": "${512:-1}"}, "wlst_type": "integer", "access": "${:RO}"}, @@ -100,7 +104,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/${NO_NAME_0:%SERVERTEMPLATE%}" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/%SERVERTEMPLATE_DEFAULTFILESTORE%" } }, "ExecuteQueue": { @@ -160,6 +164,8 @@ }, "IIOP": { "wlst_type": "IIOP", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": {}, "attributes": { "CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ], @@ -181,7 +187,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE%" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE_IIOP%" } }, "JTAMigratableTarget": { @@ -214,6 +220,8 @@ }, "Log": { "wlst_type": "Log", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": {}, "attributes": { "BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeKb", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer"} ], @@ -258,8 +266,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE%", - "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/${NO_NAME_0:%SERVERTEMPLATE%}" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE_LOG%" } }, "NetworkAccessPoint": { @@ -362,6 +369,8 @@ }, "ServerDebug": { "wlst_type": "ServerDebug", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": {}, "attributes": { "ApplicationContainer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationContainer", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ], @@ -853,7 +862,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/${NO_NAME_0:%SERVERTEMPLATE%}" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/%SERVERTEMPLATE_DEBUG%" } }, "ServerDiagnosticConfig": { @@ -895,6 +904,8 @@ }, "ServerStart": { "wlst_type": "ServerStart", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": {}, "attributes": { "BeaHome": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BeaHome", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ], @@ -912,7 +923,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/${NO_NAME_0:%SERVERTEMPLATE%}" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/%SERVERTEMPLATE_START%" } }, "SingleSignOnServices" : { @@ -1020,7 +1031,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATESSL%" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATE_SSL%" } }, "TransactionLogJDBCStore": { @@ -1068,6 +1079,8 @@ }, "WebServer": { "wlst_type": "WebServer", + "child_folders_type": "single_unpredictable", + "default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}", "folders": { "WebServerLog": { "wlst_type": "WebServerLog", @@ -1094,7 +1107,7 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}" } } }, @@ -1133,8 +1146,8 @@ }, "wlst_attributes_path": "WP001", "wlst_paths": { - "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}", - "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}/Targets" + "WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%", + "WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/Targets" } }, "WebService": { From a0284f337a12164ca5a68b015c9c42a31eef119e Mon Sep 17 00:00:00 2001 From: rkillen Date: Thu, 12 Jul 2018 15:45:01 -0500 Subject: [PATCH 3/4] Issue #132 - Fixed unit test --- core/src/test/python/aliases_test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/test/python/aliases_test.py b/core/src/test/python/aliases_test.py index 2190ef72cf..3d83ecd2e4 100644 --- a/core/src/test/python/aliases_test.py +++ b/core/src/test/python/aliases_test.py @@ -1282,6 +1282,7 @@ def testListGetToList(self): location = LocationContext().append_location(FOLDERS.SERVER) location.add_name_token(self.aliases.get_name_token(location), 'AdminServer') location = location.append_location(FOLDERS.SSL) + location.add_name_token(self.aliases.get_name_token(location), 'AdminServer') wlst_list = ['TLS', 'WITH_AES_256_CBC'] attribute = 'Ciphersuite' From 7ec4010b59f856ca3f7a6052ccb56a1dd4bf5ffa Mon Sep 17 00:00:00 2001 From: crountre Date: Thu, 12 Jul 2018 17:28:15 -0500 Subject: [PATCH 4/4] Add missing server and server template attributes --- .../weblogic/deploy/aliases/category_modules/Server.json | 3 ++- .../deploy/aliases/category_modules/ServerTemplate.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json index 5ff9c8e294..c12b4b0e47 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/Server.json @@ -345,7 +345,8 @@ "wlst_type": "ServerFailureTrigger", "folders": {}, "attributes": { - "MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ], + "MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600 }, "wlst_type": "integer"} ], + "StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ] }, "wlst_attributes_path": "WP001", diff --git a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json index 56a40a4b2f..ab6c89ce21 100644 --- a/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json +++ b/core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules/ServerTemplate.json @@ -345,7 +345,8 @@ "wlst_type": "ServerFailureTrigger", "folders": {}, "attributes": { - "MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ], + "MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600 }, "wlst_type": "integer"} ], + "StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ], "Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ] }, "wlst_attributes_path": "WP001",