Skip to content

Commit cca7e6a

Browse files
CarolynRountreeCarolynRountree
committed
Fixes for alias problems found in system test
1 parent 9ba0de1 commit cca7e6a

File tree

11 files changed

+65
-68
lines changed

11 files changed

+65
-68
lines changed

‎core/src/main/python/wlsdeploy/tool/create/creator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ def _set_attribute(self, location, model_name, model_value, uses_path_tokens_nam
346346
logged_value = wlst_value
347347
if masked:
348348
logged_value = '<masked>'
349+
print 'wlst_name ', wlst_name, ' type is ', type(wlst_value)
349350
self.logger.finest('WLSDPLY-12115', wlst_name, logged_value,
350351
class_name=self.__class_name, method_name=_method_name)
351352
self.wlst_helper.set(wlst_name, wlst_value, masked=masked)

‎core/src/main/python/wlsdeploy/tool/discover/discoverer.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ def _get_attributes_for_current_location_online(self, location):
141141
_method_name = '_get_attributes_for_current_location_online'
142142
attributes = dict()
143143
path = self._alias_helper.get_wlst_attributes_path(location)
144-
added = False
145144
try:
146145
attributes = wlst_helper.lsa(path)
147146
mbean_attributes = wlst_helper.get_mbi().getAttributes()
@@ -151,7 +150,6 @@ def _get_attributes_for_current_location_online(self, location):
151150
name = mbean_attribute.getName()
152151
if name not in attributes and name in alias_attributes:
153152
attributes[name] = wlst_helper.get(name)
154-
added = True
155153
except PyWLSTException, pe:
156154
name = location.get_model_folders()[-1]
157155
_logger.fine('WLSDPLY-06109', name, str(location), pe.getLocalizedMessage(), class_name=_class_name,

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,29 @@
99
"AltDescriptorPath": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "AltDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
1010
"AltWLSDescriptorPath": [ {"version": "[10,10.3.6)", "wlst_mode": "offline", "wlst_name": "AltWlsDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" },
1111
{"version": "[10.3.6,)", "wlst_mode": "offline", "wlst_name": "AltWLSDescriptorPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
12-
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
13-
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
12+
"ApplicationIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${RO}" } ],
13+
"ApplicationName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ApplicationName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${RO}" } ],
1414
"CacheInAppDirectory": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CacheInAppDirectory", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
1515
"CompatibilityName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1616
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
1717
"DeploymentPrincipalName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentPrincipalName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
18-
"InstallDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InstallDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
19-
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}"} ],
18+
"InstallDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InstallDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
19+
"ModuleType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ModuleType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2020
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2121
"ParallelDeployModules": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ParallelDeployModules", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
22-
"PlanDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
23-
"PlanPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true" } ],
22+
"PlanDir": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanDir", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
23+
"PlanPath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PlanPath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
2424
"PlanStagingMode": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "PlanStagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
25-
"SecurityDDModel": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "SecurityDdModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
26-
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
27-
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" } ],
25+
"SecurityDDModel": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Security${Dd:DD}Model", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" },
26+
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "SecurityDDModel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}" }],
2827
"SourcePath": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SourcePath", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}", "uses_path_tokens": "true" } ],
2928
"StagingMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StagingMode", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3029
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None"}, "wlst_type": "delimited_string" },
3130
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None"}, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
3231
"Untargeted": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Untargeted", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
33-
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "ValidateDdSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" },
34-
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" },
35-
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "${:RO}" } ],
36-
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
32+
"ValidateDDSecurityData": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "Validate${Dd:DD}SecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "get_method": "${:GET}"},
33+
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "ValidateDDSecurityData", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean" } ],
34+
"VersionIdentifier": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "VersionIdentifier", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${RO}" } ]
3735
},
3836
"wlst_attributes_path": "WP001",
3937
"wlst_paths": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@
153153
"AdditionalAutoMigrationAttempts": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AdditionalAutoMigrationAttempts", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
154154
"AsyncSessionQueueTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AsyncSessionQueueTimeout", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer" } ],
155155
"AutoMigrationTableName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AutoMigrationTableName", "wlst_path": "WP001", "value": {"default": "ACTIVE" }, "wlst_type": "string" } ],
156-
"CandidateMachinesForMigratableServer": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "CandidateMachinesForMigratableServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string", "restart_required": true } ],
156+
"CandidateMachinesForMigratableServers": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "CandidateMachinesForMigratableServers", "wlst_path": "WP001", "value": {"default": "[]" }, "wlst_type": "jarray", "restart_required": true } ],
157157
"ClientCertProxyEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClientCertProxyEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
158158
"ClusterAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterAddress", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
159159
"ClusterBroadcastChannel": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterBroadcastChannel", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"InternalAppsDeployOnDemandEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InternalAppsDeployOnDemandEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
3333
"JavaServiceConsoleEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaServiceConsoleEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
3434
"JavaServiceEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "JavaServiceEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
35-
"LastModificationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LastModificationTime", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
35+
"LastModificationTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "LastModificationTime", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "long", "access": "RO"} ],
3636
"LogFormatCompatibilityEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogFormatCompatibilityEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
3737
"MaxConcurrentLongRunningRequests": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MaxConcurrentLongRunningRequests", "wlst_path": "WP001", "value": {"default": 50 }, "wlst_type": "integer" } ],
3838
"MaxConcurrentNewThreads": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "MaxConcurrentNewThreads", "wlst_path": "WP001", "value": {"default": 50 }, "wlst_type": "integer" } ],
@@ -45,7 +45,7 @@
4545
"ParallelDeployApplications": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ParallelDeployApplications", "wlst_path": "WP001", "value": {"default": "${false:true}" }, "wlst_type": "boolean" } ],
4646
"PartitionUriSpace": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PartitionUriSpace", "wlst_path": "WP001", "value": {"default": "/partitions" }, "wlst_type": "string" } ],
4747
"ProductionModeEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ProductionModeEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
48-
"RootDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RootDirectory", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
48+
"RootDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RootDirectory", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "RO", "uses_path_tokens": "true"} ],
4949
"ServerMigrationHistorySize": [ {"version": "[12.1.2,12.2.1.3)", "wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" },
5050
{"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ServerMigrationHistorySize", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
5151
"ServiceMigrationHistorySize": [ {"version": "[12.1.2,12.2.1.3)", "wlst_mode": "both", "wlst_name": "ServiceMigrationHistorySize", "wlst_path": "WP001", "value": {"default": -1 }, "wlst_type": "integer" },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"SynchronousWritePolicy": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SynchronousWritePolicy", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
3131
"Target": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "Target", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string" },
3232
{"version": "[10,)", "wlst_mode": "online", "wlst_name": "Targets", "wlst_path": "WP002", "value": {"default": "None" }, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "set_method": "MBEAN.set_target_mbeans", "set_mbean_type": "weblogic.management.configuration.TargetMBean"} ],
33-
"XAResourceName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "XAResourceName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]
33+
"XAResourceName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "XAResourceName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "${:RO}"} ]
3434
},
3535
"wlst_attributes_path": "WP001",
3636
"wlst_paths": {

0 commit comments

Comments
 (0)