Log version-invalid fields at INFO for lax validation; improve logging for targeted injectors

Author: rakillen

core/src/main/python/wlsdeploy/tool/util/variable_injector.py

@@ -190,14 +190,17 @@ def inject_variables_keyword_file(self, append_option=None):
         _method_name = 'inject_variables_keyword_file'
         _logger.entering(class_name=_class_name, method_name=_method_name)
 
-        # check for file location overrides from command line
-
-        injector_file_override = self.__model_context.get_variable_injector_file()
-        if injector_file_override is not None:
-            variable_injector_location_file = injector_file_override
-            _logger.info('WLSDPLY-19600', injector_file_override, class_name=_class_name, method_name=_method_name)
+        if self.__model_context.is_targetted_config():
+            # this is mostly used for logging, so put the target config path here
+            variable_injector_location_file = self.__model_context.get_target_configuration_file()
         else:
-            variable_injector_location_file = path_utils.find_config_path(VARIABLE_INJECTOR_FILE_NAME)
+            # check for file location overrides from command line
+            injector_file_override = self.__model_context.get_variable_injector_file()
+            if injector_file_override is not None:
+                variable_injector_location_file = injector_file_override
+                _logger.info('WLSDPLY-19600', injector_file_override, class_name=_class_name, method_name=_method_name)
+            else:
+                variable_injector_location_file = path_utils.find_config_path(VARIABLE_INJECTOR_FILE_NAME)
 
         keywords_file_override = self.__model_context.get_variable_keywords_file()
         if keywords_file_override is not None:

core/src/main/python/wlsdeploy/tool/validate/validator.py

@@ -18,6 +18,7 @@
 from wlsdeploy.aliases.wlst_modes import WlstModes
 from wlsdeploy.exception.expection_types import ExceptionType
 from wlsdeploy.exception import exception_helper
+from wlsdeploy.logging.platform_logger import PlatformLogger
 from wlsdeploy.tool.create import wlsroles_helper
 from wlsdeploy.tool.util.archive_helper import ArchiveHelper
 from wlsdeploy.tool.validate import validation_utils
@@ -40,6 +41,7 @@
 
 _class_name = 'Validator'
 _logger = ValidatorLogger('wlsdeploy.validate')
+_info_logger = PlatformLogger('wlsdeploy.validate')
 _ModelNodeTypes = Enum(['FOLDER_TYPE', 'NAME_TYPE', 'ATTRIBUTE', 'ARTIFICIAL_TYPE'])
 _ValidationModes = Enum(['STANDALONE', 'TOOL'])
 _ROOT_LEVEL_VALIDATION_AREA = validation_utils.format_message('WLSDPLY-05000')
@@ -412,8 +414,7 @@ def __validate_model_section(self, model_section_key, model_dict, valid_section_
                     result, message = self._aliases.is_valid_model_folder_name(validation_location,
                                                                                     section_dict_key)
                     if result == ValidationCodes.VERSION_INVALID:
-                        # key is a VERSION_INVALID folder
-                        self._logger.warning('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
+                        self._log_version_invalid(message, _method_name)
                     elif result == ValidationCodes.INVALID:
                         self._logger.severe('WLSDPLY-05026', section_dict_key, 'folder', model_folder_path,
                                             '%s' % ', '.join(valid_section_folders), class_name=_class_name,
@@ -423,8 +424,7 @@ def __validate_model_section(self, model_section_key, model_dict, valid_section_
                     result, message = self._aliases.is_valid_model_attribute_name(attribute_location,
                                                                                        section_dict_key)
                     if result == ValidationCodes.VERSION_INVALID:
-                        self._logger.warning('WLSDPLY-05027', message, class_name=_class_name,
-                                             method_name=_method_name)
+                        self._log_version_invalid(message, _method_name)
                     elif result == ValidationCodes.INVALID:
                         self._logger.severe('WLSDPLY-05029', section_dict_key, model_folder_path,
                                             '%s' % ', '.join(valid_attr_infos), class_name=_class_name,
@@ -440,7 +440,7 @@ def __validate_section_folder(self, model_node, validation_location):
 
         result, message = self._aliases.is_version_valid_location(validation_location)
         if result == ValidationCodes.VERSION_INVALID:
-            self._logger.warning('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
+            self._log_version_invalid(message, _method_name)
             return
         elif result == ValidationCodes.INVALID:
             self._logger.severe('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
@@ -623,8 +623,7 @@ def __process_model_node(self, model_node, validation_location):
                     # See if it's a version invalid folder
                     result, message = self._aliases.is_valid_model_folder_name(validation_location, key)
                     if result == ValidationCodes.VERSION_INVALID:
-                        # key is a VERSION_INVALID folder
-                        self._logger.warning('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
+                        self._log_version_invalid(message, _method_name)
                     elif result == ValidationCodes.INVALID:
                         # key is an INVALID folder
                         self._logger.severe('WLSDPLY-05026', key, 'folder', model_folder_path,
@@ -638,8 +637,7 @@ def __process_model_node(self, model_node, validation_location):
                     # See if it's a version invalid attribute
                     result, message = self._aliases.is_valid_model_attribute_name(validation_location, key)
                     if result == ValidationCodes.VERSION_INVALID:
-                        # key is a VERSION_INVALID attribute
-                        self._logger.warning('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
+                        self._log_version_invalid(message, _method_name)
                     elif result == ValidationCodes.INVALID:
                         # key is an INVALID attribute
                         self._logger.severe('WLSDPLY-05029', key, model_folder_path,
@@ -695,7 +693,7 @@ def __validate_attribute(self, attribute_name, attribute_value, valid_attr_infos
         else:
             result, message = self._aliases.is_valid_model_attribute_name(validation_location, attribute_name)
             if result == ValidationCodes.VERSION_INVALID:
-                self._logger.warning('WLSDPLY-05027', message, class_name=_class_name, method_name=_method_name)
+                self._log_version_invalid(message, _method_name)
             elif result == ValidationCodes.INVALID:
                 self._logger.severe('WLSDPLY-05029', attribute_name, model_folder_path,
                                     '%s' % ', '.join(valid_attr_infos), class_name=_class_name,
@@ -935,3 +933,18 @@ def _report_unsupported_variable_usage(self, tokenized_value, model_folder_path)
         for token in tokens:
             self._logger.severe('WLSDPLY-05030', model_folder_path, token,
                                 class_name=_class_name, method_name=_method_name)
+
+    def _log_version_invalid(self, message, method_name):
+        """
+        Log a message indicating that an attribute is not valid for the current WLS version and WLST mode.
+        Log INFO if validation method is "lax", otherwise log WARNING.
+        """
+        if self._model_context.is_targetted_config():
+            validation_method = self._model_context.get_target_configuration().get_validation_method()
+        else:
+            validation_method = self._model_context.get_validation_method()
+
+        log_method = self._logger.warning
+        if validation_method == 'lax':
+            log_method = _info_logger.info
+        log_method('WLSDPLY-05027', message, class_name=_class_name, method_name=method_name)

core/src/main/python/wlsdeploy/util/model_context.py

@@ -618,8 +618,7 @@ def get_target_configuration(self):
             configuration_dict = {}
 
             if self._target:
-                target_path = os.path.join('targets', self._target, 'target.json')
-                target_configuration_file = path_utils.find_config_path(target_path)
+                target_configuration_file = self.get_target_configuration_file()
                 if os.path.exists(target_configuration_file):
                     file_handle = open(target_configuration_file)
                     configuration_dict = eval(file_handle.read())
@@ -628,6 +627,12 @@ def get_target_configuration(self):
 
         return self._target_configuration
 
+    def get_target_configuration_file(self):
+        if self._target:
+            target_path = os.path.join('targets', self._target, 'target.json')
+            return path_utils.find_config_path(target_path)
+        return None
+
     def get_target(self):
         return self._target
 

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -1558,8 +1558,7 @@ WLSDPLY-19529=Variable {0} was inserted into the model string {1} for attribute
 WLSDPLY-19530=Segment was not found in attribute {0} value so entire variable value was replaced by {1}
 WLSDPLY-19531=Invalid location {0} for variable injection into attribute {1} : {2}
 WLSDPLY-19532=No model variable injector file {0}
-WLSDPLY-19533=Will inject variable replacement strings into model using keyword directions found in model \
-  variable injector file {0}
+WLSDPLY-19533=Will inject variable replacement strings into model using keyword directions found in file {0}
 WLSDPLY-19534=Update existing variable file {0} with injected variables
 WLSDPLY-19535=Create new variable file {0} for injected variables
 WLSDPLY-19536=Append existing variable file {0} with injected variables
@@ -1634,6 +1633,9 @@ WLSDPLY-20029=Specified validation method to use was empty or null
 WLSDPLY-20030=Specified validation method {0} is invalid, must be one of: {1}
 WLSDPLY-20031={0} specified Variable File {1} is not a valid file: {2}
 WLSDPLY-20032=No model specified and no model in archive, no validation performed
+WLSDPLY-20033=Unsupported attribute {0} at location {1} removed from model
+WLSDPLY-20034=Applying filter with ID "{0}"
+WLSDPLY-20035=Applying filter with name "{0}"
 
 # Common messages used for tool exit and clean-up
 WLSDPLY-21000={0} Messages: