Skip to content

Commit 843257a

Browse files
CarolynRountreeCarolynRountree
committed
continued work to correct the alias definitions
1 parent 4bd82f9 commit 843257a

File tree

7 files changed

+53
-10
lines changed

7 files changed

+53
-10
lines changed

‎core/src/main/python/wlsdeploy/aliases/aliases.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,14 +418,15 @@ def get_wlst_attribute_name_and_value(self, location, model_attribute_name, mode
418418

419419
return wlst_attribute_name, wlst_attribute_value
420420

421-
def get_wlst_attribute_name(self, location, model_attribute_name):
421+
def get_wlst_attribute_name(self, location, model_attribute_name, check_read_only=True):
422422
"""
423423
Returns the WLST attribute name and value for the specified model attribute name and value.
424424
425425
wlst_attribute_value should return the correct type and value, even if the value
426426
is the default value for model_attribute_name.
427427
:param location:
428428
:param model_attribute_name:
429+
:param check_read_only: Defaults to True. If false, return name even if alias definition is read only
429430
:return: the WLST attribute name or None, if it is not relevant
430431
:raises: AliasException: if an error occurs due to a bad location or bad alias data
431432
"""
@@ -435,7 +436,8 @@ def get_wlst_attribute_name(self, location, model_attribute_name):
435436
class_name=self._class_name, method_name=_method_name)
436437
wlst_attribute_name = None
437438
alias_attr_dict = self._alias_entries.get_alias_attribute_entry_by_model_name(location, model_attribute_name)
438-
if alias_attr_dict is not None and not self.__is_model_attribute_read_only(location, alias_attr_dict):
439+
if alias_attr_dict is not None and (not check_read_only or not
440+
self.__is_model_attribute_read_only(location, alias_attr_dict)):
439441
if WLST_NAME in alias_attr_dict:
440442
wlst_attribute_name = alias_attr_dict[WLST_NAME]
441443
else:
@@ -903,13 +905,14 @@ def get_model_attribute_name_and_value(self, location, wlst_attribute_name, wlst
903905
result={model_attribute_name: model_attribute_value})
904906
return model_attribute_name, model_attribute_value
905907

906-
def get_model_attribute_name(self, location, wlst_attribute_name):
908+
def get_model_attribute_name(self, location, wlst_attribute_name, check_read_only=True):
907909
"""
908910
Returns the model attribute name for the specified WLST attribute name and value. If the model attribute name
909911
is not valid for the version or the attribute is marked as read-only, return None
910912
911913
:param location: the location
912914
:param wlst_attribute_name: the WLST attribute name
915+
:param check_read_only: Defaults to True. If False, return the WLST attribute name even if read only
913916
:return: matching model attribute name
914917
:raises: AliasException: if an error occurs
915918
"""
@@ -920,7 +923,8 @@ def get_model_attribute_name(self, location, wlst_attribute_name):
920923
model_attribute_name = None
921924

922925
attribute_info = self._alias_entries.get_alias_attribute_entry_by_wlst_name(location, wlst_attribute_name)
923-
if attribute_info is not None and not self.__is_model_attribute_read_only(location, attribute_info):
926+
if attribute_info is not None and \
927+
(not check_read_only or not self.__is_model_attribute_read_only(location, attribute_info)):
924928
model_attribute_name = attribute_info[MODEL_NAME]
925929

926930
self._logger.exiting(class_name=self._class_name, method_name=_method_name,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@
185185
"MaxServerCountForHttpPing": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "MaxServerCountForHttpPing", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
186186
"MemberDeathDetectorEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemberDeathDetectorEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": true } ],
187187
"MemberWarmupTimeoutSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemberWarmupTimeoutSeconds", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer", "restart_required": "true" } ],
188-
"MessageOrderingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageOrderingEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" } ],
188+
"MessageOrderingEnabled": [ {"version": "[10,12.1.1)", "wlst_mode": "both", "wlst_name": "MessageOrderingEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" },
189+
{"version": "[12.1.1,)", "wlst_mode": "both", "wlst_name": "MessageOrderingEnabled", "wlst_path": "WP001", "value": {"default": "${false:true}" }, "wlst_type": "boolean", "restart_required": "true" } ],
189190
"MigrationBasis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MigrationBasis", "wlst_path": "WP001", "value": {"default": "${None:database}" }, "wlst_type": "string", "restart_required": "true" } ],
190191
"MillisToSleepBetweenAutoMigrationAttempts": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MillisToSleepBetweenAutoMigrationAttempts", "wlst_path": "WP001", "value": {"default": 180000 }, "wlst_type": "long", "restart_required": "true" } ],
191192
"MulticastAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MulticastAddress", "wlst_path": "WP001", "value": {"default": "239.192.0.0" }, "wlst_type": "string", "restart_required": "true" } ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828
},
2929
"CoherenceResource": {
30-
"wlst_type": "${Coherence:}Resource",
30+
"wlst_type": "${CoherenceResource:CoherenceClusterResource}",
3131
"version" : "[12.1.2,)",
3232
"child_folders_type": "single",
3333
"folders": {

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,25 @@
167167
"wlst_paths": {
168168
"WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/${Jdbc:JDBC}Resource/%DATASOURCE%"
169169
}
170+
},
171+
"SubDeployment" : {
172+
"wlst_type": "SubDeployment${:s}",
173+
"child_folders_type": "multiple",
174+
"folders": {},
175+
"attributes": {
176+
"CompatibilityName": [{"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}],
177+
"ModuleType": [{"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}],
178+
"Notes": [{"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}],
179+
"Target": [
180+
{"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string"},
181+
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"}
182+
]
183+
},
184+
"wlst_attributes_path": "WP001",
185+
"wlst_paths": {
186+
"WP001": "/JDBCSystemResource${:s}/%DATASOURCE%/SubDeployment${:s}/%SUBDEPLOYMENT%",
187+
"WP002": "/JDBCSystemResource${:s}/%DATASOURCE%/SubDeployment${:s}/%SUBDEPLOYMENT%/Targets"
188+
}
170189
}
171190
},
172191
"attributes": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"LogMonitoringThrottleMessageLength": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleMessageLength", "wlst_path": "WP001", "value": {"default": 50 }, "wlst_type": "integer"} ],
2727
"LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "value": {"default": 1500 }, "wlst_type": "integer"} ],
2828
"LoggerSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "value": {"default": "${None:Info}" }, "wlst_type": "string" } ],
29-
"LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
29+
"LoggerSeverityProperties": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET" } ],
3030
"MemoryBufferFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3131
"MemoryBufferSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "value": {"default": "${None:Trace}"}, "wlst_type": "string" } ],
3232
"MemoryBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "value": {"default": 10 }, "wlst_type": "integer"} ],

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
"DefaultDatasource": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DefaultDatasource", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
7272
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 1000 }, "wlst_type": "integer" } ],
7373
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
74-
"RmiJDBCSecurity": [ {"version": "[10,12.1.1)", "wlst_mode": "both", "wlst_name": "Rmi${Jdbc:JDBC}Security", "wlst_path": "WP001", "value": {"default": "Compatibility" }, "wlst_type": "string", "restart_required": "true" },
74+
"RmiJDBCSecurity": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Rmi${Jdbc:JDBC}Security", "wlst_path": "WP001", "value": {"default": "Compatibility" }, "wlst_type": "string", "get_method": "LSA", "restart_required": "true" },
7575
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "RmiJDBCSecurity", "wlst_path": "WP001", "value": {"default": "Compatibility" }, "wlst_type": "string", "restart_required": "true" } ],
7676
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string" },
7777
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None" }, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ]
@@ -1008,8 +1008,8 @@
10081008
"HostnameVerifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HostnameVerifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
10091009
"IdentityAndTrustLocations": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "IdentityAndTrustLocations", "wlst_path": "WP001", "value": {"default": "${None:KeyStores}" }, "wlst_type": "string" } ],
10101010
"InboundCertificateValidation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InboundCertificateValidation", "wlst_path": "WP001", "value": {"default": "${None:BuiltinSSLValidationOnly}"}, "wlst_type": "string" } ],
1011-
"JSSEEnabled": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "${Jsse:JSSE}Enabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "get_method": "LSA", "restart_required": "true" },
1012-
{"version": "[12.1.2,12.2.1)", "wlst_mode": "both", "wlst_name": "${Jsse:JSSE}Enabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean", "get_method": "LSA", "restart_required": "true" },
1011+
"JSSEEnabled": [ {"version": "[10,12.1.1)", "wlst_mode": "both", "wlst_name": "${Jsse:JSSE}Enabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "get_method": "LSA", "restart_required": "true" },
1012+
{"version": "[12.1.1,12.2.1)", "wlst_mode": "both", "wlst_name": "${Jsse:JSSE}Enabled", "wlst_path": "WP001", "value": {"default": "${false:true}" }, "wlst_type": "boolean", "get_method": "LSA", "restart_required": "true" },
10131013
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "JSSEEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean", "get_method": "LSA", "restart_required": "true" } ],
10141014
"KeyEncrypted": [ {"version": "[10,12.2.1.2)", "wlst_mode": "both", "wlst_name": "KeyEncrypted", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
10151015
"ListenPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "value": {"default": 7002 }, "wlst_type": "integer", "get_method": "LSA"} ],

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,25 @@
326326
"wlst_paths": {
327327
"WP001": "/WLDFSystemResource${:s}/%WLDFRESOURCE%/WLDFResource/%WLDFRESOURCE%"
328328
}
329+
},
330+
"SubDeployment" : {
331+
"wlst_type": "SubDeployment${:s}",
332+
"child_folders_type": "multiple",
333+
"folders": {},
334+
"attributes": {
335+
"CompatibilityName": [{"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}],
336+
"ModuleType": [{"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}],
337+
"Notes": [{"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "string"}],
338+
"Target": [
339+
{"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string"},
340+
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "get_method": "GET", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"}
341+
]
342+
},
343+
"wlst_attributes_path": "WP001",
344+
"wlst_paths": {
345+
"WP001": "/WLDFSystemResource${:s}/%WLDFRESOURC/SubDeployment${:s}/%SUBDEPLOYMENT%",
346+
"WP002": "/WLDFSystemResource${:s}/%WLDFRESOURC/SubDeployment${:s}/%SUBDEPLOYMENT%/Targets"
347+
}
329348
}
330349
},
331350
"attributes": {

0 commit comments

Comments
 (0)