Skip to content

Commit b1f5726

Browse files
robertpatrickrobertpatrick
authored
cleaning up online discovery errors (#1394)
1 parent adcd59b commit b1f5726

File tree

4 files changed

+39
-3
lines changed

4 files changed

+39
-3
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@
655655
"DebugJAXPIncludeLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJAXPIncludeLocation", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
656656
"DebugJAXPIncludeName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJAXPIncludeName", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
657657
"DebugJAXPIncludeTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJAXPIncludeTime", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
658+
"DebugJAXPOutputStream": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "DebugJAXPOutputStream", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
658659
"DebugJAXPUseShortClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJAXPUseShortClass", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
659660
"DebugJDBCConn": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJDBCConn", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
660661
"DebugJDBCDriverLogging": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugJDBCDriverLogging", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
@@ -933,13 +934,15 @@
933934
"DebugXMLEntityCacheIncludeLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheIncludeLocation", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
934935
"DebugXMLEntityCacheIncludeName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheIncludeName", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
935936
"DebugXMLEntityCacheIncludeTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheIncludeTime", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
937+
"DebugXMLEntityCacheOutputStream": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "DebugXMLEntityCacheOutputStream", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
936938
"DebugXMLEntityCacheUseShortClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheUseShortClass", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
937939
"DebugXMLRegistryDebugLevel": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryDebugLevel", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer"} ],
938940
"DebugXMLRegistryDebugName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryDebugName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
939941
"DebugXMLRegistryIncludeClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeClass", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
940942
"DebugXMLRegistryIncludeLocation": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeLocation", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
941943
"DebugXMLRegistryIncludeName": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeName", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
942944
"DebugXMLRegistryIncludeTime": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeTime", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
945+
"DebugXMLRegistryOutputStream": [ {"version": "[10,)", "wlst_mode": "online", "wlst_name": "DebugXMLRegistryOutputStream", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
943946
"DebugXMLRegistryUseShortClass": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryUseShortClass", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
944947
"DefaultStore": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DefaultStore", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
945948
"DiagnosticContextDebugMode": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DiagnosticContextDebugMode", "wlst_path": "WP001", "default_value": "${__NULL__:Off}", "wlst_type": "string" } ],

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,7 @@
301301
"LogMonitoringThrottleThreshold": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "LogMonitoringThrottleThreshold", "wlst_path": "WP001", "default_value": 1500, "wlst_type": "integer"} ],
302302
"LoggerSeverity": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoggerSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Info}", "wlst_type": "string" } ],
303303
"LoggerSeverityProperties": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "LoggerSeverityProperties", "wlst_path": "WP001", "default_value": null, "wlst_type": "properties", "preferred_model_type": "dict", "get_method": "GET"} ],
304-
"MemoryBufferFilter": [ {"version": "[12.1.2,12.1.3)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ,
305-
{"version": "[12.1.3,)", "wlst_mode": "offline", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ],
304+
"MemoryBufferFilter": [ {"version": "[12.1.2)", "wlst_mode": "both", "wlst_name": "MemoryBufferFilter", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "set_method": "MBEAN.set_log_filter_mbean", "set_mbean_type": "weblogic.management.configuration.LogFilterMBean" } ],
306305
"MemoryBufferSeverity": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSeverity", "wlst_path": "WP001", "default_value": "${__NULL__:Trace}", "wlst_type": "string" } ],
307306
"MemoryBufferSize": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "MemoryBufferSize", "wlst_path": "WP001", "default_value": 10, "production_default": "${__NULL__:500}", "wlst_type": "integer"} ],
308307
"Notes": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "Notes", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
@@ -667,6 +666,7 @@
667666
"DebugJAXPIncludeLocation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJAXPIncludeLocation", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
668667
"DebugJAXPIncludeName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJAXPIncludeName", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
669668
"DebugJAXPIncludeTime": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJAXPIncludeTime", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
669+
"DebugJAXPOutputStream": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "DebugJAXPOutputStream", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
670670
"DebugJAXPUseShortClass": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJAXPUseShortClass", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
671671
"DebugJDBCConn": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJDBCConn", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
672672
"DebugJDBCDriverLogging": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugJDBCDriverLogging", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
@@ -943,13 +943,15 @@
943943
"DebugXMLEntityCacheIncludeLocation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheIncludeLocation", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
944944
"DebugXMLEntityCacheIncludeName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheIncludeName", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
945945
"DebugXMLEntityCacheIncludeTime": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheIncludeTime", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
946+
"DebugXMLEntityCacheOutputStream": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "DebugXMLEntityCacheOutputStream", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
946947
"DebugXMLEntityCacheUseShortClass": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLEntityCacheUseShortClass", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
947948
"DebugXMLRegistryDebugLevel": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryDebugLevel", "wlst_path": "WP001", "default_value": 0, "wlst_type": "integer"} ],
948949
"DebugXMLRegistryDebugName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryDebugName", "wlst_path": "WP001", "default_value": null, "wlst_type": "string" } ],
949950
"DebugXMLRegistryIncludeClass": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeClass", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
950951
"DebugXMLRegistryIncludeLocation": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeLocation", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
951952
"DebugXMLRegistryIncludeName": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeName", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
952953
"DebugXMLRegistryIncludeTime": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryIncludeTime", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
954+
"DebugXMLRegistryOutputStream": [ {"version": "[12.1.2,)", "wlst_mode": "online", "wlst_name": "DebugXMLRegistryOutputStream", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "IGNORED" } ],
953955
"DebugXMLRegistryUseShortClass": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DebugXMLRegistryUseShortClass", "wlst_path": "WP001", "default_value": "false", "secure_default": "${__NULL__:true}", "wlst_type": "boolean"} ],
954956
"DefaultStore": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DefaultStore", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean"} ],
955957
"DiagnosticContextDebugMode": [ {"version": "[12.1.2,)", "wlst_mode": "both", "wlst_name": "DiagnosticContextDebugMode", "wlst_path": "WP001", "default_value": "${__NULL__:Off}", "wlst_type": "string" } ],

‎integration-tests/alias-test/verify/src/test/python/aliastest/verify/utils.py

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from aliastest.verify.verify_context import VerifyModelContext
2222

2323
__logger = PlatformLogger('test.aliases')
24-
CLASS_NAME = 'generate/utils'
24+
CLASS_NAME = 'verify/utils'
2525

2626
OFFLINE_ALIAS_FOLDER_IGNORE_MAP = {
2727
'/': ['ODLConfiguration', 'OHS', 'RCUDbInfo', 'Security', 'UnixMachine', 'WLSRoles',
@@ -33,6 +33,19 @@
3333
'/ResourceGroupTemplate': ['SystemComponents']
3434
}
3535

36+
ONLINE_ALIAS_ATTRIBUTE_IGNORE_MAP = {
37+
'/Server/ServerDebug': [
38+
'DebugJAXPOutputStream',
39+
'DebugXMLRegistryOutputStream',
40+
'DebugXMLEntityCacheOutputStream'
41+
],
42+
'/ServerTemplate/ServerDebug': [
43+
'DebugJAXPOutputStream',
44+
'DebugXMLRegistryOutputStream',
45+
'DebugXMLEntityCacheOutputStream'
46+
]
47+
}
48+
3649
OFFLINE_TEST_ANOMALIES_MAP = {
3750
'/Application': {
3851
'ModuleType': 'war',
@@ -282,6 +295,18 @@ def is_alias_folder_in_ignore_list(model_context, location, alias_name):
282295
return False
283296

284297

298+
def is_alias_attribute_in_ignore_list(model_context, location, alias_name):
299+
_method_name = 'is_alias_attribute_in_ignore_list'
300+
if model_context.get_target_wlst_mode() == WlstModes.ONLINE:
301+
ignore_map = ONLINE_ALIAS_ATTRIBUTE_IGNORE_MAP
302+
path = location.get_folder_path()
303+
304+
if path in ignore_map and alias_name in ignore_map[path]:
305+
__logger.finer('{0}:{1} found in ignore list', path, alias_name,
306+
class_name=CLASS_NAME, method_name=_method_name)
307+
return True
308+
return False
309+
285310
def is_attribute_value_test_anomaly(model_context, location, attribute_name, attribute_value):
286311
if model_context.get_target_wlst_mode() == WlstModes.OFFLINE:
287312
anomaly_map = OFFLINE_TEST_ANOMALIES_MAP

‎integration-tests/alias-test/verify/src/test/python/aliastest/verify/verifier.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,13 @@ def _verify_attributes_at_location(self, generated_attributes, location):
443443

444444
for unprocessed in unprocessed_alias_list:
445445
if unprocessed in self._alias_helper.get_ignore_attribute_names():
446+
_logger.finest('Attribute {0} in alias attribute ignore list', unprocessed,
447+
class_name=CLASS_NAME, method_name=_method_name)
446448
self._add_info(location, INFO_ATTRIBUTE_IN_IGNORE_LIST, attribute=unprocessed)
449+
elif verify_utils.is_alias_attribute_in_ignore_list(self._model_context, location, unprocessed):
450+
_logger.fine('Attribute {0} at location {1} being ignored because it was in the ignore list',
451+
unprocessed, location.get_folder_path(), class_name=CLASS_NAME,
452+
method_name=_method_name)
447453
else:
448454
message = ''
449455
if verify_utils.is_clear_text_password(unprocessed):

0 commit comments

Comments
 (0)