Skip to content

Commit 23b7af2

Browse files
changing ignore list messages from errors to info (#1223)
1 parent ee5be80 commit 23b7af2

File tree

2 files changed

+5
-4
lines changed
  • core/src/main/resources/oracle/weblogic/deploy/aliases/category_modules
  • integration-tests/alias-test/verify/src/test/python/aliastest/verify

2 files changed

+5
-4
lines changed

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
@@ -26,7 +26,7 @@
2626
"DbPassiveMode": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "${Db:DB}PassiveMode", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ],
2727
"DbPassiveModeGracePeriodSeconds": [ {"version": "[12.2.1.3,)", "wlst_mode": "both", "wlst_name": "${Db:DB}PassiveModeGracePeriodSeconds", "wlst_path": "WP001", "default_value": 30, "wlst_type": "integer" } ],
2828
"DiagnosticContextCompatibilityModeEnabled": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "DiagnosticContextCompatibilityModeEnabled", "wlst_path": "WP001", "default_value": "true", "wlst_type": "boolean" } ],
29-
"DomainVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainVersion", "wlst_path": "WP001", "default_value": null, "wlst_type": "string", "access": "ROD"} ],
29+
"DomainVersion": [ {"version": "[10,)", "wlst_mode": "both", "wlst_name": "DomainVersion", "wlst_path": "WP001", "default_value": null, "derived_default": "true", "wlst_type": "string", "access": "ROD"} ],
3030
"EnableEeCompliantClassloadingForEmbeddedAdapters": [ {"version": "[12.2.1,)", "wlst_mode": "both", "wlst_name": "Enable${Ee:EE}CompliantClassloadingForEmbeddedAdapters", "wlst_path": "WP001", "default_value": "${false:true}", "wlst_type": "boolean", "get_method": "LSA" } ],
3131
"ExalogicOptimizationsEnabled": [ {"version": "[10.3.4,)", "wlst_mode": "both", "wlst_name": "ExalogicOptimizationsEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean", "restart_required": "true" } ],
3232
"GuardianEnabled": [ {"version": "[10,12.2.1.3)", "wlst_mode": "both", "wlst_name": "GuardianEnabled", "wlst_path": "WP001", "default_value": "false", "wlst_type": "boolean" } ,

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,14 @@
5353
ATTRIBUTE_ERROR_RANGE = range(4000, 4999)
5454

5555
TESTED_MBEAN_FOLDER = 1000
56+
INFO_ATTRIBUTE_IN_IGNORE_LIST = 1001
5657

5758
WARN_MBEAN_NOT_NO_NAME_0 = 5101
5859
WARN_ATTRIBUTE_DEPRECATED = 5502
5960
WARN_ATTRIBUTE_HAS_UNKNOWN_TYPE = 5500
6061
WARN_ALIAS_FOLDER_NOT_IMPLEMENTED = 5501
6162

63+
6264
ERROR_FAILURE_ATTRIBUTE_LIST = 2000
6365
ERROR_FAILURE_ATTRIBUTE_UNEXPECTED = 2001
6466

@@ -90,7 +92,6 @@
9092
ERROR_ATTRIBUTE_NOT_IN_WLST = 4018
9193
ERROR_ATTRIBUTE_CANNOT_CONVERT_BACK = 4019
9294
ERROR_ATTRIBUTE_CANNOT_SET = 4020
93-
ERROR_ATTRIBUTE_IN_IGNORE_LIST = 4021
9495
ERROR_ATTRIBUTE_PATH_TOKEN_REQUIRED = 4022
9596
ERROR_ATTRIBUTE_WRONG_DEFAULT_VALUE = 4023
9697
ERROR_ATTRIBUTE_MUST_BE_NO_NAME = 4024
@@ -127,7 +128,7 @@
127128
ERROR_ATTRIBUTE_NOT_RESTART: 'Attribute marked restart',
128129
ERROR_ATTRIBUTE_CANNOT_SET: 'Cannot SET default value',
129130
ERROR_ATTRIBUTE_MUST_BE_NO_NAME: 'Attribute name must be set to NO_NAME_0',
130-
ERROR_ATTRIBUTE_IN_IGNORE_LIST: 'Alias attribute is WLST attribute in the ignore list',
131+
INFO_ATTRIBUTE_IN_IGNORE_LIST: 'Alias attribute is WLST attribute in the ignore list',
131132
ERROR_ATTRIBUTE_NOT_IN_WLST: 'Alias attribute not in MBean',
132133
ERROR_FAILURE_ATTRIBUTE_LIST: 'Invalid Alias attribute list',
133134
ERROR_CANNOT_TEST_MBEAN_UNSPECIFIED: 'Unspecified problem',
@@ -404,7 +405,7 @@ def _verify_attributes_at_location(self, generated_attributes, location):
404405

405406
for unprocessed in unprocessed_alias_list:
406407
if unprocessed in self._alias_helper.get_ignore_attribute_names():
407-
self._add_error(location, ERROR_ATTRIBUTE_IN_IGNORE_LIST, attribute=unprocessed)
408+
self._add_info(location, INFO_ATTRIBUTE_IN_IGNORE_LIST, attribute=unprocessed)
408409
else:
409410
message = ''
410411
if verify_utils.is_clear_text_password(unprocessed):

0 commit comments

Comments
 (0)