Skip to content

Commit ce3b3e1

Browse files
CarolynRountreeCarolynRountree
committed
add DynamicallyCreated to list of ignore attributes
1 parent c93a4b1 commit ce3b3e1

File tree

9 files changed

+3
-24
lines changed

9 files changed

+3
-24
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
from wlsdeploy.aliases.alias_constants import WLST_SUBFOLDERS_PATH
5353
from wlsdeploy.aliases.alias_constants import WLST_TYPE
5454

55+
IGNORE_FOR_MODEL_LIST = ['DynamicallyCreated', 'Id', 'Tag', 'Tags', 'Type', 'Name']
5556
_class_name = 'AliasEntries'
5657
_logger = PlatformLogger('wlsdeploy.aliases')
5758

@@ -743,7 +744,7 @@ def get_alias_attribute_entry_by_wlst_name(self, location, wlst_attribute_name):
743744
else:
744745
_logger.warning('WLSDPLY-08110', wlst_attribute_name, location.get_folder_path(), WLST_PATH)
745746
else:
746-
if wlst_attribute_name not in ('Id', 'Tag', 'Tags', 'Type', 'Name'):
747+
if wlst_attribute_name not in IGNORE_FOR_MODEL_LIST:
747748
ex = exception_helper.create_alias_exception('WLSDPLY-08111', location.get_folder_path(),
748749
wlst_attribute_name)
749750
_logger.throwing(ex, class_name=_class_name, method_name=_method_name)

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -887,12 +887,6 @@ def get_model_attribute_name(self, location, wlst_attribute_name):
887887
if attribute_info is not None:
888888
model_attribute_name = attribute_info[MODEL_NAME]
889889

890-
if wlst_attribute_name not in ('Id', 'Tag', 'Name') and model_attribute_name is None:
891-
ex = exception_helper.create_alias_exception('WLSDPLY-08406', wlst_attribute_name,
892-
location.get_folder_path())
893-
self._logger.throwing(ex, class_name=self._class_name, method_name=_method_name)
894-
raise ex
895-
896890
self._logger.exiting(class_name=self._class_name, method_name=_method_name,
897891
result=model_attribute_name)
898892
return model_attribute_name

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
"attributes" : {
4343
"CoherenceWebFederatedStorageEnabled": [ {"version": "[12.2.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceWebFederatedStorageEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
4444
"CoherenceWebLocalStorageEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceWebLocalStorageEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
45-
"DynamicallyCreated": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "access": "RO" } ],
4645
"LocalStorageEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LocalStorageEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ]
4746
},
4847
"wlst_attributes_path": "WP001",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
},
2424
"attributes": {
2525
"DeploymentOrder": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DeploymentOrder", "wlst_path": "WP001", "value": {"default": 100 }, "wlst_type": "integer" } ],
26-
"DynamicallyCreated": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "RO" } ],
2726
"InitialContextFactory": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InitialContextFactory", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2827
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
2928
"PasswordEncrypted": [ {"version": "[10,)", "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/JMX.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"attributes": {
99
"CompatibilityMBeanServerEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CompatibilityMBeanServerEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
1010
"DomainMBeanServerEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainMBeanServerEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
11-
"DynamicallyCreated": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer", "access": "RO"} ],
1211
"EditMBeanServerEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "EditMBeanServerEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],
1312
"InvocationTimeoutSeconds": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InvocationTimeoutSeconds", "wlst_path": "WP001", "value": {"default": 0 }, "wlst_type": "integer"} ],
1413
"ManagedServerNotificationsEnabled": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "ManagedServerNotificationsEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean"} ],

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"DomainLogBroadcastFilter": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastFilter", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1212
"DomainLogBroadcastSeverity": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcastSeverity", "wlst_path": "WP001", "value": {"default": "${None:Notice"}, "wlst_type": "string" } ],
1313
"DomainLogBroadcasterBufferSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainLogBroadcasterBufferSize", "wlst_path": "WP001", "value": {"default": "${1:10}" }, "wlst_type": "integer"} ],
14-
"DynamicallyCreated": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": false }, "wlst_type": "boolean", "access": "RO"} ],
1514
"FileCount": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileCount", "wlst_path": "WP001", "value": {"default": "${7:100}" }, "wlst_type": "integer"} ],
1615
"FileMinSize": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileMinSize", "wlst_path": "WP001", "value": {"default": "${500:5000" }, "wlst_type": "integer"} ],
1716
"FileName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "FileName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"child_folders_type": "multiple",
77
"folders": {},
88
"attributes": {
9-
"DynamicallyCreated": [ {"version": "[12.2.1,)", "wlst_mode": "online", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "RO" } ],
109
"Immutable": [ {"version": "[12.2.1,)", "wlst_mode": "offline", "wlst_name": "Immutable", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "RO" } ],
1110
"Notes": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1211
"ResourceGroupTemplateId": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ResourceGroupTemplateId", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string", "access": "RO" } ],

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"attributes": {
1212
"CoherenceWebFederatedStorageEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceWebFederatedStorageEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
1313
"CoherenceWebLocalStorageEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "CoherenceWebLocalStorageEnabled", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
14-
"DynamicallyCreated": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "access": "RO"}],
1514
"LocalStorageEnabled": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LocalStorageEnabled", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
1615
"ManagementProxy": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ManagementProxy", "wlst_path": "WP001", "value": {"default": "true" }, "wlst_type": "boolean" } ],
1716
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -107,7 +106,6 @@
107106
"child_folders_type": "multiple",
108107
"folders": {},
109108
"attributes": {
110-
"DynamicallyCreated": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "access": "${:RO}"} ],
111109
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
112110
"QueueLength": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "QueueLength", "wlst_path": "WP001", "value": {"default": 65536 }, "wlst_type": "integer" } ],
113111
"QueueLengthThresholdPercent": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "QueueLengthThresholdPercent", "wlst_path": "WP001", "value": {"default": 90 }, "wlst_type": "integer" } ],
@@ -957,8 +955,7 @@
957955
"ServiceProviderPreferredBinding": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "ServiceProviderPreferredBinding", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
958956
"SignAuthnRequests": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SignAuthnRequests", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
959957
"SsoSigningKeyAlias": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "SsoSigningKeyAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
960-
"SsoSigningKeyPassPhraseEncrypted": [ {"version": "[12.2.1,12.2.1.1)", "wlst_mode": "both", "wlst_name": "SsoSigningKeyPassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password"},
961-
{"version": "[12.2.1.1,)", "wlst_mode": "both", "wlst_name": "SsoSigningKeyPassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
958+
"SsoSigningKeyPassPhraseEncrypted": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "${Sso:SSO}SigningKeyPassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
962959
"TransportLayerSecurityKeyAlias": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "TransportLayerSecurityKeyAlias", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
963960
"TransportLayerSecurityKeyPassPhraseEncrypted": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "TransportLayerSecurityKeyPassPhraseEncrypted", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "password", "get_method": "GET" } ],
964961
"WantArtifactRequestsSigned": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "WantArtifactRequestsSigned", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
@@ -1147,7 +1144,6 @@
11471144
"attributes": {
11481145
"AcknowledgementInterval": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "AcknowledgementInterval", "wlst_path": "WP001", "value": {"default": "P0DT0.2S"}, "wlst_type": "string" } ],
11491146
"BaseRetransmissionInterval": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "BaseRetransmissionInterval", "wlst_path": "WP001", "value": {"default": "P0DT0.2S"}, "wlst_type": "string" } ],
1150-
"DynamicallyCreated": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean", "access": "RO"} ],
11511147
"InactivityTimeout": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "InactivityTimeout", "wlst_path": "WP001", "value": {"default": "P0DT0.2S"}, "wlst_type": "string" } ],
11521148
"NonBufferedDestination": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NonBufferedDestination", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
11531149
"NonBufferedSource": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "NonBufferedSource", "wlst_path": "WP001", "value": {"default": "false" }, "wlst_type": "boolean" } ],
@@ -1170,7 +1166,6 @@
11701166
"attributes": {
11711167
"CleanerInterval": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "CleanerInterval", "wlst_path": "WP001", "value": {"default": "PT10M"}, "wlst_type": "string" } ],
11721168
"DefaultMaximumObjectLifetime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultMaximumObjectLifetime", "wlst_path": "WP001", "value": {"default": "P1D" }, "wlst_type": "string" } ],
1173-
"DynamicallyCreated": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "RO"} ],
11741169
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
11751170
"PersistenceStrategy": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PersistenceStrategy", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
11761171
"PhysicalStoreName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "PhysicalStoreName", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
@@ -1188,7 +1183,6 @@
11881183
"folders": {},
11891184
"attributes": {
11901185
"Location": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Location", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
1191-
"DynamicallyCreated": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DynamicallyCreated", "wlst_path": "WP001", "value": {"default": "false"}, "wlst_type": "boolean", "access": "RO"} ],
11921186
"Notes": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
11931187
"StoreType": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "StoreType", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ],
11941188
"SynchronousWritePolicy": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "SynchronousWritePolicy", "wlst_path": "WP001", "value": {"default": "None" }, "wlst_type": "string" } ]

0 commit comments

Comments
 (0)