Skip to content

Commit dd21b7c

Browse files
CarolynRountreeCarolynRountree
committed
some fixes for defaults
1 parent 7b17240 commit dd21b7c

File tree

6 files changed

+28
-29
lines changed

6 files changed

+28
-29
lines changed

‎core/src/main/python/wlsdeploy/util/wlst_helper.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ def lsa(path=None, log_throwing=True):
246246
value = entry.getValue()
247247
if value is not None and type(value) is str:
248248
new_value = value.rstrip()
249-
if new_value == 'null':
249+
if new_value == 'null' or new_value == 'none':
250250
make_dict[key] = None
251251
else:
252252
make_dict[key] = new_value

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -153,39 +153,39 @@
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": "both", "wlst_name": "CandidateMachinesForMigratableServer", "wlst_path": "WP001", "value": {"default": "[]" }, "wlst_type": "delimited_string" } ],
156+
"CandidateMachinesForMigratableServer": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "CandidateMachinesForMigratableServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "delimited_string" } ],
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" } ],
160160
"ClusterMessagingMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterMessagingMode", "wlst_path": "WP001", "value": {"default": "unicast" }, "wlst_type": "string" } ],
161161
"ClusterType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ClusterType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
162162
"CoherenceClusterSystemResource": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceClusterSystemResource", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
163163
"ConcurrentSingletonActivationEnabled": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "ConcurrentSingletonActivationEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
164-
"ConsensusParticipants": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ConsensusParticipants", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
164+
"ConsensusParticipants": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "ConsensusParticipants", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
165165
"DataSourceForAutomaticMigration": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForAutomaticMigration", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
166166
"DataSourceForJobScheduler": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForJobScheduler", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
167167
"DataSourceForSessionPersistence": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DataSourceForSessionPersistence", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
168168
"DatabaseLeasingBasisConnectionRetryCount": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "DatabaseLeasingBasisConnectionRetryCount", "wlst_path": "WP001", "value": {"default": 1 }, "wlst_type": "integer", "get_method": "GET" } ],
169169
"DatabaseLeasingBasisConnectionRetryDelay": [ {"version": "[12.1.3,)", "wlst_mode": "both", "wlst_name": "DatabaseLeasingBasisConnectionRetryDelay", "wlst_path": "WP001", "value": {"default": 1000 }, "wlst_type": "integer" } ],
170-
"DeathDetectorHeartbeatPeriod": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DeathDetectorHeartbeatPeriod", "wlst_path": "WP001", "value": {"default": 1 }, "wlst_type": "integer" } ],
171-
"DefaultLoadAlgorithm": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultLoadAlgorithm", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
170+
"DeathDetectorHeartbeatPeriod": [ {"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "DeathDetectorHeartbeatPeriod", "wlst_path": "WP001", "value": {"default": 1 }, "wlst_type": "integer" } ],
171+
"DefaultLoadAlgorithm": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultLoadAlgorithm", "wlst_path": "WP001", "value": {"default": "${None:round-robin}" }, "wlst_type": "string" } ],
172172
"FencingGracePeriodMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FencingGracePeriodMillis", "wlst_path": "WP001", "value": {"default": 30000 }, "wlst_type": "integer" } ],
173173
"FrontendHTTPPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FrontendHTTPPort", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
174174
"FrontendHTTPSPort": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FrontendHTTPSPort", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
175175
"FrontendHost": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FrontendHost", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
176176
"GreedySessionFlushInterval": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "GreedySessionFlushInterval", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
177177
"HealthCheckIntervalMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HealthCheckIntervalMillis", "wlst_path": "WP001", "value": {"default": 10000 }, "wlst_type": "integer" } ],
178178
"HealthCheckPeriodsUntilFencing": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HealthCheckPeriodsUntilFencing", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
179-
"HttpPingRetryCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HttpPingRetryCount", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
179+
"HttpPingRetryCount": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "HttpPingRetryCount", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
180180
"HttpTraceSupportEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "HttpTraceSupportEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
181181
"IdlePeriodsUntilTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "IdlePeriodsUntilTimeout", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
182182
"InterClusterCommLinkHealthCheckInterval": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InterClusterCommLinkHealthCheckInterval", "wlst_path": "WP001", "value": {"default": 30000 }, "wlst_type": "integer" } ],
183183
"JobSchedulerTableName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "JobSchedulerTableName", "wlst_path": "WP001", "value": {"default": "WEBLOGIC_TIMERS" }, "wlst_type": "string" } ],
184-
"MaxServerCountForHttpPing": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MaxServerCountForHttpPing", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
184+
"MaxServerCountForHttpPing": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "MaxServerCountForHttpPing", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
185185
"MemberDeathDetectorEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemberDeathDetectorEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
186186
"MemberWarmupTimeoutSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MemberWarmupTimeoutSeconds", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer" } ],
187187
"MessageOrderingEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MessageOrderingEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
188-
"MigrationBasis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MigrationBasis", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
188+
"MigrationBasis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MigrationBasis", "wlst_path": "WP001", "value": {"default": "${None:database}" }, "wlst_type": "string" } ],
189189
"MillisToSleepBetweenAutoMigrationAttempts": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MillisToSleepBetweenAutoMigrationAttempts", "wlst_path": "WP001", "value": {"default": 180000 }, "wlst_type": "long" } ],
190190
"MulticastAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MulticastAddress", "wlst_path": "WP001", "value": {"default": "239.192.0.0" }, "wlst_type": "string" } ],
191191
"MulticastBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "MulticastBufferSize", "wlst_path": "WP001", "value": {"default": 64 }, "wlst_type": "integer" } ],
@@ -197,7 +197,7 @@
197197
"NumberOfServersInClusterAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NumberOfServersInClusterAddress", "wlst_path": "WP001", "value": {"default": 3 }, "wlst_type": "integer" } ],
198198
"OneWayRmiForReplicationEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "OneWayRmiForReplicationEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
199199
"PersistSessionsOnShutdown": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PersistSessionsOnShutdown", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
200-
"ProxyServer": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ProxyServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
200+
"ProxyServer": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "ProxyServer", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
201201
"RemoteClusterAddress": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RemoteClusterAddress", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
202202
"ReplicationChannel": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ReplicationChannel", "wlst_path": "WP001", "value": {"default": "ReplicationChannel" }, "wlst_type": "string" } ],
203203
"ReplicationTimeoutEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ReplicationTimeoutEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
@@ -216,7 +216,7 @@
216216
"SingletonServiceRequestTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SingletonServiceRequestTimeout", "wlst_path": "WP001", "value": {"default": 30000 }, "wlst_type": "integer" } ],
217217
"SiteName": [ {"version": "[12.2.1.2,)", "wlst_mode": "both", "wlst_name": "SiteName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
218218
"TxnAffinityEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "TxnAffinityEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
219-
"UnicastDiscoveryPeriodMillis": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "UnicastDiscoveryPeriodMillis", "wlst_path": "WP001", "value": {"default": 3000 }, "wlst_type": "integer" } ],
219+
"UnicastDiscoveryPeriodMillis": [ {"version": "[10,)", "wlst_mode": "offline", "wlst_name": "UnicastDiscoveryPeriodMillis", "wlst_path": "WP001", "value": {"default": 3000 }, "wlst_type": "integer" } ],
220220
"UnicastReadTimeout": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "UnicastReadTimeout", "wlst_path": "WP001", "value": {"default": 15000 }, "wlst_type": "integer" } ],
221221
"WANSessionPersistenceTableName": [ {"version": "[10,12.1.2)", "wlst_mode": "offline", "wlst_name": "WanSessionPersistenceTableName", "wlst_path": "WP001", "value": {"default": "WLS_WAN_PERSISTENCE_TABLE" }, "wlst_type": "string" },
222222
{"version": "[12.1.2,)", "wlst_mode": "offline", "wlst_name": "WANSessionPersistenceTableName", "wlst_path": "WP001", "value": {"default": "WLS_WAN_PERSISTENCE_TABLE" }, "wlst_type": "string" },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"OCMEnabled": [ {"version": "[10,12.1.2)", "wlst_mode": "both", "wlst_name": "OcmEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" },
4242
{"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "OCMEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
4343
"ParallelDeployApplicationModules": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ParallelDeployApplicationModules", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
44-
"ParallelDeployApplications": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ParallelDeployApplications", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
44+
"ParallelDeployApplications": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ParallelDeployApplications", "wlst_path": "WP001", "value": {"default": "${false:true}" }, "wlst_type": "boolean" } ],
4545
"PartitionUriSpace": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "PartitionUriSpace", "wlst_path": "WP001", "value": {"default": "/partitions" }, "wlst_type": "string" } ],
4646
"ProductionModeEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ProductionModeEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
4747
"RootDirectory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "RootDirectory", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "uses_path_tokens": "true"} ],

0 commit comments

Comments
 (0)