Skip to content

Commit f2f33e4

Browse files
CarolynRountreeCarolynRountree
committed
WDT alias changes for online versus offline differences
1 parent 61794b8 commit f2f33e4

File tree

8 files changed

+19
-20
lines changed

8 files changed

+19
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ def get_unix_machines(self):
238238
self._discover_subfolders(result[machine], location)
239239
location.remove_name_token(name_token)
240240

241-
_logger.exiting(class_name=_class_name, method_name=_method_name, result=result)
241+
_logger.exiting(class_name=_cjlass_name, method_name=_method_name, result=result)
242242
return model_top_folder_name, result
243243

244244
def get_machines(self, unix_machines=None):

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@
181181
"ClusterMessagingMode": [ {"version": "[10,12.1.1)", "wlst_mode": "both", "wlst_name": "ClusterMessagingMode", "wlst_path": "WP001", "value": {"default": "${unicast:multicast}" }, "wlst_type": "string" } ,
182182
{"version": "[12.1.1,)", "wlst_mode": "both", "wlst_name": "ClusterMessagingMode", "wlst_path": "WP001", "value": {"default": "unicast" }, "wlst_type": "string" } ],
183183
"ClusterType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "restart_required": "true" } ],
184-
"CoherenceClusterSystemResource": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceClusterSystemResource", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "${:MBEAN.set_coherence_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.CoherenceClusterSystemResourceMBean}", "restart_required": "true" } ],
184+
"CoherenceClusterSystemResource": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceClusterSystemResource", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "${LSA:GET}","set_method": "${:MBEAN.set_coherence_cluster_mbean}", "set_mbean_type": "${:weblogic.management.configuration.CoherenceClusterSystemResourceMBean}", "restart_required": "true" } ],
185185
"ConcurrentSingletonActivationEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ConcurrentSingletonActivationEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "restart_required": "true" } ],
186186
"ConsensusParticipants": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConsensusParticipants", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer", "get_method": "GET" } ],
187-
"DataSourceForAutomaticMigration": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForAutomaticMigration", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_data_source_mbean", "set_mbean_type": "weblogic.management.configuration.JDBCSystemResourceMBean", "restart_required": "true" } ],
187+
"DataSourceForAutomaticMigration": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForAutomaticMigration", "wlst_path": "WP001", "value": {"default": "defaultCoherenceCluster" }, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_data_source_mbean", "set_mbean_type": "weblogic.management.configuration.JDBCSystemResourceMBean", "restart_required": "true" } ],
188188
"DataSourceForJobScheduler": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForJobScheduler", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}" } ],
189189
"DataSourceForSessionPersistence": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForSessionPersistence", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "set_method": "${:MBEAN.set_data_source_mbean}", "set_mbean_type": "${:weblogic.management.configuration.JDBCSystemResourceMBean}", "restart_required": "true" } ],
190190
"DatabaseLeasingBasisConnectionRetryCount": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "DatabaseLeasingBasisConnectionRetryCount", "wlst_path": "WP001", "value": {"default": 1 }, "wlst_type": "integer", "get_method": "GET", "restart_required": "true" } ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"ListenAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenAddress", "wlst_path": "WP001", "value": {"default": "localhost" }, "wlst_type": "string" } ],
2323
"ListenPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ListenPort", "wlst_path": "WP001", "value": {"default": 5556 }, "wlst_type": "integer" } ],
2424
"NMSocketCreateTimeoutInMillis": [ {"version": "[12.2.1.2,)", "wlst_mode": "both", "wlst_name": "NMSocketCreateTimeoutInMillis", "wlst_path": "WP001", "value": {"default": 180000 }, "wlst_type": "integer" } ],
25-
"NMType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NMType", "wlst_path": "WP001", "value": {"default": "${None:SSL}" }, "wlst_type": "string" } ],
25+
"NMType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NMType", "wlst_path": "WP001", "value": {"default": "SSL" }, "wlst_type": "string" } ],
2626
"NodeManagerHome": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NodeManagerHome", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],
2727
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2828
"PasswordEncrypted": [ {"version": "[10.3.4,)", "wlst_mode": "both", "wlst_name": "PasswordEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET"} ],

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"attributes": {
1010
"AdditionalMigrationAttempts": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "AdditionalMigrationAttempts", "wlst_path": "WP001", "value": {"default": 2 }, "wlst_type": "integer" } ],
1111
"AllCandidateServers": [ {"version": "[12.1.3,)", "wlst_mode": "online", "wlst_name": "AllCandidateServers", "wlst_path": "WP001", "value": {"default": [] }, "wlst_type": "jarray", "preferred_model_type": "delimited_string", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean"} ],
12-
"Cluster": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Cluster", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_cluster_mbean", "set_mbean_type": "weblogic.management.configuration.ClusterMBean" } ],
13-
"ConstrainedCandidateServer": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "ConstrainedCandidateServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string", "get_method": "LSA"},
12+
"Cluster": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Cluster", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_cluster_mbean", "set_mbean_type": "weblogic.management.configuration.ClusterMBean" } ],
13+
"ConstrainedCandidateServer": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "ConstrainedCandidateServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string", "get_method": "${LSA:GET}"},
1414
{"version": "[12.1.3,)", "wlst_mode": "online", "wlst_name": "ConstrainedCandidateServers", "wlst_path": "WP002", "value": {"default": "None" }, "wlst_type": "jarray", "preferred_model_type": "list", "get_method": "GET", "set_method": "MBEAN.set_server_mbeans", "set_mbean_type": "weblogic.management.configuration.ServerMBean" } ],
1515
"Critical": [ {"version": "[12.1.3,12.2.1)", "wlst_mode": "online","wlst_name": "Critical", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ,
1616
{"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Critical", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
1717
"DestinationServer": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "DestinationServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA"} ],
1818
"HostingServer": [ {"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "HostingServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA" } ,
1919
{"version": "[12.1.3,)", "wlst_mode": "online", "wlst_name": "HostingServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "RO", "get_method": "GET", "set_method": "MBEAN.set_server_mbean", "set_mbean_type": "weblogic.management.configuration.ServerMBean" } ],
20-
"MigrationPolicy": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MigrationPolicy", "wlst_path": "WP001", "value": {"default": "${None:manual}" }, "wlst_type": "string" } ],
20+
"MigrationPolicy": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MigrationPolicy", "wlst_path": "WP001", "value": {"default": "manual" }, "wlst_type": "string" } ],
2121
"MillisToSleepBetweenAttempts": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "MillisToSleepBetweenAttempts", "wlst_path": "WP001", "value": {"default": 300000 }, "wlst_type": "integer" } ],
2222
"NonLocalPostAllowed": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "NonLocalPostAllowed", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
2323
"Notes": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -27,7 +27,7 @@
2727
"PreScript": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "PreScript", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2828
"RestartOnFailure": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "RestartOnFailure", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
2929
"SecondsBetweenRestarts": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "SecondsBetweenRestarts", "wlst_path": "WP001", "value": {"default": 30 }, "wlst_type": "integer" } ],
30-
"UserPreferredServer": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "UserPreferredServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "LSA", "set_method": "MBEAN.set_server_mbean", "set_mbean_type": "weblogic.management.configuration.ServerMBean" } ]
30+
"UserPreferredServer": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "UserPreferredServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "get_method": "${LSA:GET}", "set_method": "MBEAN.set_server_mbean", "set_mbean_type": "weblogic.management.configuration.ServerMBean" } ]
3131
},
3232
"wlst_attributes_path": "WP001",
3333
"wlst_paths": {

0 commit comments

Comments
 (0)