Skip to content

Commit 9de88e0

Browse files
rakillenrakillen
authored
Merge pull request #139 from oracle/issue#132-correct-single-unpredictable-folders
Issue#132 correct single unpredictable folders
2 parents d8be6a7 + 7ec4010 commit 9de88e0

File tree

3 files changed

+61
-27
lines changed

3 files changed

+61
-27
lines changed

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

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
},
3131
"COM": {
3232
"wlst_type": "COM",
33+
"child_folders_type": "single_unpredictable",
34+
"default_name_value": "${NO_NAME_0:%SERVER%}",
3335
"folders": {},
3436
"attributes": {
3537
"ApartmentThreaded": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApartmentThreaded", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean"} ],
@@ -42,10 +44,11 @@
4244
},
4345
"wlst_attributes_path": "WP001",
4446
"wlst_paths": {
45-
"WP001": "/Server${:s}/%SERVER%/COM/%SERVER%"
47+
"WP001": "/Server${:s}/%SERVER%/COM/%SERVER_COM%"
4648
}
4749
},
4850
"ConfigurationProperty" : {
51+
"child_folders_type": "multiple",
4952
"version" : "[12.2.1,)",
5053
"folders" : {},
5154
"attributes" : {
@@ -81,6 +84,8 @@
8184
},
8285
"DefaultFileStore": {
8386
"wlst_type": "DefaultFileStore",
87+
"child_folders_type": "single_unpredictable",
88+
"default_name_value": "${NO_NAME_0:%SERVER%}",
8489
"folders": {},
8590
"attributes": {
8691
"BlockSize": [ {"version": "[10,10.3.4)", "wlst_mode": "both", "wlst_name": "BlockSize", "wlst_path": "WP001", "value": {"default": "${512:-1}" }, "wlst_type": "integer", "access": "${:RO}"},
@@ -98,7 +103,7 @@
98103
},
99104
"wlst_attributes_path": "WP001",
100105
"wlst_paths": {
101-
"WP001": "/Server${:s}/%SERVER%/DefaultFileStore/${NO_NAME_0:%SERVER%}"
106+
"WP001": "/Server${:s}/%SERVER%/DefaultFileStore/%SERVER_DEFAULTFILESTORE%"
102107
}
103108
},
104109
"ExecuteQueue": {
@@ -158,6 +163,8 @@
158163
},
159164
"IIOP": {
160165
"wlst_type": "IIOP",
166+
"child_folders_type": "single_unpredictable",
167+
"default_name_value": "${NO_NAME_0:%SERVER%}",
161168
"folders": {},
162169
"attributes": {
163170
"CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
@@ -179,7 +186,7 @@
179186
},
180187
"wlst_attributes_path": "WP001",
181188
"wlst_paths": {
182-
"WP001": "/Server${:s}/%SERVER%/IIOP/%SERVER%"
189+
"WP001": "/Server${:s}/%SERVER%/IIOP/%SERVE_IIOP%"
183190
}
184191
},
185192
"JTAMigratableTarget": {
@@ -212,6 +219,8 @@
212219
},
213220
"Log": {
214221
"wlst_type": "Log",
222+
"child_folders_type": "single_unpredictable",
223+
"default_name_value": "${NO_NAME_0:%SERVER%}",
215224
"folders": {},
216225
"attributes": {
217226
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeKb", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer"} ],
@@ -256,7 +265,7 @@
256265
},
257266
"wlst_attributes_path": "WP001",
258267
"wlst_paths": {
259-
"WP001": "/Server${:s}/%SERVER%/Log/%SERVER%"
268+
"WP001": "/Server${:s}/%SERVER%/Log/%SERVER_LOG%"
260269
}
261270
},
262271
"NetworkAccessPoint": {
@@ -336,7 +345,8 @@
336345
"wlst_type": "ServerFailureTrigger",
337346
"folders": {},
338347
"attributes": {
339-
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ],
348+
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600 }, "wlst_type": "integer"} ],
349+
"StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ],
340350
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
341351
},
342352
"wlst_attributes_path": "WP001",
@@ -360,6 +370,8 @@
360370
},
361371
"ServerDebug": {
362372
"wlst_type": "ServerDebug",
373+
"child_folders_type": "single_unpredictable",
374+
"default_name_value": "${NO_NAME_0:%SERVER%}",
363375
"folders": {},
364376
"attributes": {
365377
"ApplicationContainer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationContainer", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -851,7 +863,7 @@
851863
},
852864
"wlst_attributes_path": "WP001",
853865
"wlst_paths": {
854-
"WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER%"
866+
"WP001": "/Server${:s}/%SERVER%/ServerDebug/%SERVER_DEBUG%"
855867
}
856868
},
857869
"ServerDiagnosticConfig": {
@@ -893,6 +905,8 @@
893905
},
894906
"ServerStart": {
895907
"wlst_type": "ServerStart",
908+
"child_folders_type": "single_unpredictable",
909+
"default_name_value": "${NO_NAME_0:%SERVER%}",
896910
"folders": {},
897911
"attributes": {
898912
"Arguments": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Arguments", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string[space]" } ],
@@ -910,7 +924,7 @@
910924
},
911925
"wlst_attributes_path": "WP001",
912926
"wlst_paths": {
913-
"WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER%"
927+
"WP001": "/Server${:s}/%SERVER%/ServerStart/%SERVER_START%"
914928
}
915929
},
916930
"SingleSignOnServices" : {
@@ -970,6 +984,8 @@
970984
},
971985
"SSL": {
972986
"wlst_type": "SSL",
987+
"child_folders_type": "single_unpredictable",
988+
"default_name_value": "${NO_NAME_0:%SERVER%}",
973989
"folders": {},
974990
"attributes": {
975991
"AcceptKssDemoCertsEnabled": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AcceptKssDemoCertsEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
@@ -1016,7 +1032,7 @@
10161032
},
10171033
"wlst_attributes_path": "WP001",
10181034
"wlst_paths": {
1019-
"WP001": "/Server${:s}/%SERVER%/SSL/%SERVER%"
1035+
"WP001": "/Server${:s}/%SERVER%/SSL/%SERVER_SSL%"
10201036
}
10211037
},
10221038
"TransactionLogJDBCStore": {
@@ -1064,6 +1080,8 @@
10641080
},
10651081
"WebServer": {
10661082
"wlst_type": "WebServer",
1083+
"child_folders_type": "single_unpredictable",
1084+
"default_name_value": "${NO_NAME_0:%SERVER%}",
10671085
"folders": {
10681086
"WebServerLog": {
10691087
"wlst_type": "WebServerLog",
@@ -1092,7 +1110,7 @@
10921110
},
10931111
"wlst_attributes_path": "WP001",
10941112
"wlst_paths": {
1095-
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER%/WebServerLog/%WEBSERVERLOG%"
1113+
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/WebServerLog/%WEBSERVERLOG%"
10961114
}
10971115
}
10981116
},
@@ -1131,8 +1149,8 @@
11311149
},
11321150
"wlst_attributes_path": "WP001",
11331151
"wlst_paths": {
1134-
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER%",
1135-
"WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER%/Targets"
1152+
"WP001": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%",
1153+
"WP002": "/Server${:s}/%SERVER%/WebServer/%SERVER_WEBSERVER%/Targets"
11361154
}
11371155
},
11381156
"WebService": {

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

Lines changed: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
},
3232
"COM": {
3333
"wlst_type": "COM",
34+
"child_folders_type": "single_unpredictable",
35+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
3436
"folders": {},
3537
"attributes": {
3638
"ApartmentThreaded": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApartmentThreaded", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
@@ -43,10 +45,11 @@
4345
},
4446
"wlst_attributes_path": "WP001",
4547
"wlst_paths": {
46-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE%"
48+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/COM/%SERVERTEMPLATE_COM%"
4749
}
4850
},
4951
"ConfigurationProperty" : {
52+
"child_folders_type": "multiple",
5053
"version" : "[12.2.1,)",
5154
"folders" : {},
5255
"attributes" : {
@@ -59,7 +62,7 @@
5962
"wlst_type" : "ConfigurationPropert${y:ies}",
6063
"wlst_attributes_path": "WP001",
6164
"wlst_paths": {
62-
"WP001": "/Server${:s}/%SERVER%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%"
65+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ConfigurationPropert${y:ies}/%PROPERTY_NAME%"
6366
}
6467
},
6568
"DataSource": {
@@ -82,6 +85,8 @@
8285
},
8386
"DefaultFileStore": {
8487
"wlst_type": "DefaultFileStore",
88+
"child_folders_type": "single_unpredictable",
89+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
8590
"folders": {},
8691
"attributes": {
8792
"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 +104,7 @@
99104
},
100105
"wlst_attributes_path": "WP001",
101106
"wlst_paths": {
102-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/${NO_NAME_0:%SERVERTEMPLATE%}"
107+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DefaultFileStore/%SERVERTEMPLATE_DEFAULTFILESTORE%"
103108
}
104109
},
105110
"ExecuteQueue": {
@@ -159,6 +164,8 @@
159164
},
160165
"IIOP": {
161166
"wlst_type": "IIOP",
167+
"child_folders_type": "single_unpredictable",
168+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
162169
"folders": {},
163170
"attributes": {
164171
"CompleteMessageTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompleteMessageTimeout", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" } ],
@@ -180,7 +187,7 @@
180187
},
181188
"wlst_attributes_path": "WP001",
182189
"wlst_paths": {
183-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE%"
190+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/IIOP/%SERVERTEMPLATE_IIOP%"
184191
}
185192
},
186193
"JTAMigratableTarget": {
@@ -213,6 +220,8 @@
213220
},
214221
"Log": {
215222
"wlst_type": "Log",
223+
"child_folders_type": "single_unpredictable",
224+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
216225
"folders": {},
217226
"attributes": {
218227
"BufferSizeKb": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BufferSizeKb", "wlst_path": "WP001", "value": {"default": 8 }, "wlst_type": "integer"} ],
@@ -257,8 +266,7 @@
257266
},
258267
"wlst_attributes_path": "WP001",
259268
"wlst_paths": {
260-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE%",
261-
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/${NO_NAME_0:%SERVERTEMPLATE%}"
269+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/Log/%SERVERTEMPLATE_LOG%"
262270
}
263271
},
264272
"NetworkAccessPoint": {
@@ -337,12 +345,13 @@
337345
"wlst_type": "ServerFailureTrigger",
338346
"folders": {},
339347
"attributes": {
340-
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ],
348+
"MaxStuckThreadTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxStuckThreadTime", "wlst_path": "WP001", "value": {"default": 600 }, "wlst_type": "integer"} ],
349+
"StuckThreadCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StuckThreadCount", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ],
341350
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
342351
},
343352
"wlst_attributes_path": "WP001",
344353
"wlst_paths": {
345-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/${NO_NAME_0:%SERVERTEMPLATE%}/ServerFailureTrigger/${NO_NAME_0:%SERVER%}"
354+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/OverloadProtection/${NO_NAME_0:%SERVERTEMPLATE%}/ServerFailureTrigger/${NO_NAME_0:%SERVERTEMPLATE%}"
346355
}
347356
}
348357
},
@@ -361,6 +370,8 @@
361370
},
362371
"ServerDebug": {
363372
"wlst_type": "ServerDebug",
373+
"child_folders_type": "single_unpredictable",
374+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
364375
"folders": {},
365376
"attributes": {
366377
"ApplicationContainer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationContainer", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean"} ],
@@ -852,7 +863,7 @@
852863
},
853864
"wlst_attributes_path": "WP001",
854865
"wlst_paths": {
855-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/${NO_NAME_0:%SERVERTEMPLATE%}"
866+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerDebug/%SERVERTEMPLATE_DEBUG%"
856867
}
857868
},
858869
"ServerDiagnosticConfig": {
@@ -894,6 +905,8 @@
894905
},
895906
"ServerStart": {
896907
"wlst_type": "ServerStart",
908+
"child_folders_type": "single_unpredictable",
909+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
897910
"folders": {},
898911
"attributes": {
899912
"BeaHome": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BeaHome", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
@@ -911,7 +924,7 @@
911924
},
912925
"wlst_attributes_path": "WP001",
913926
"wlst_paths": {
914-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/${NO_NAME_0:%SERVERTEMPLATE%}"
927+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/ServerStart/%SERVERTEMPLATE_START%"
915928
}
916929
},
917930
"SingleSignOnServices" : {
@@ -1019,7 +1032,7 @@
10191032
},
10201033
"wlst_attributes_path": "WP001",
10211034
"wlst_paths": {
1022-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATESSL%"
1035+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/SSL/%SERVERTEMPLATE_SSL%"
10231036
}
10241037
},
10251038
"TransactionLogJDBCStore": {
@@ -1062,11 +1075,13 @@
10621075
"wlst_attributes_path": "WP001",
10631076
"wlst_paths": {
10641077
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/TransactionLogJDBCStore/${NO_NAME_0:%SERVERTEMPLATE%}",
1065-
"WP003": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/${NO_NAME_0:%SERVERTEMPLATE%}/Targets"
1078+
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/DataSource/${NO_NAME_0:%SERVERTEMPLATE%}/Targets"
10661079
}
10671080
},
10681081
"WebServer": {
10691082
"wlst_type": "WebServer",
1083+
"child_folders_type": "single_unpredictable",
1084+
"default_name_value": "${NO_NAME_0:%SERVERTEMPLATE%}",
10701085
"folders": {
10711086
"WebServerLog": {
10721087
"wlst_type": "WebServerLog",
@@ -1093,7 +1108,7 @@
10931108
},
10941109
"wlst_attributes_path": "WP001",
10951110
"wlst_paths": {
1096-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}"
1111+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/WebServerLog/${NO_NAME_0:%SERVERTEMPLATE%}"
10971112
}
10981113
}
10991114
},
@@ -1132,8 +1147,8 @@
11321147
},
11331148
"wlst_attributes_path": "WP001",
11341149
"wlst_paths": {
1135-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}",
1136-
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/${NO_NAME_0:%SERVERTEMPLATE%}/Targets"
1150+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%",
1151+
"WP002": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebServer/%SERVERTEMPLATE_WEBSERVER%/Targets"
11371152
}
11381153
},
11391154
"WebService": {
@@ -1201,7 +1216,7 @@
12011216
},
12021217
"wlst_attributes_path": "WP001",
12031218
"wlst_paths": {
1204-
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/${NO_NAME_0:%SERVERTEMPLATE%}/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}%"
1219+
"WP001": "/ServerTemplate${:s}/%SERVERTEMPLATE%/WebService/${NO_NAME_0:%SERVERTEMPLATE%}/WebServicePersistence/${NO_NAME_0:%SERVERTEMPLATE%}"
12051220
}
12061221
},
12071222
"WebServiceBuffering": {

‎core/src/test/python/aliases_test.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1282,6 +1282,7 @@ def testListGetToList(self):
12821282
location = LocationContext().append_location(FOLDERS.SERVER)
12831283
location.add_name_token(self.aliases.get_name_token(location), 'AdminServer')
12841284
location = location.append_location(FOLDERS.SSL)
1285+
location.add_name_token(self.aliases.get_name_token(location), 'AdminServer')
12851286
wlst_list = ['TLS', 'WITH_AES_256_CBC']
12861287
attribute = 'Ciphersuite'
12871288

0 commit comments

Comments
 (0)