made sure VERSION_INVALID condition results in validation warning (instead of error), regardless of validation mode

Author: mwooten

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

@@ -478,21 +478,15 @@ def __validate_model_section(self, model_section_key, model_dict, valid_section_
                                                                                     section_dict_key)
                     if result == ValidationCodes.VERSION_INVALID:
                         # key is a VERSION_INVALID folder
-                        if self._validation_mode == _ValidationModes.STANDALONE:
-                            validation_result.add_warning('WLSDPLY-05027', message)
-                        else:
-                            validation_result.add_error('WLSDPLY-05027', message)
+                        validation_result.add_warning('WLSDPLY-05027', message)
                     elif result == ValidationCodes.INVALID:
                         validation_result.add_error('WLSDPLY-05026', section_dict_key, 'folder',
                                                     model_folder_path, '%s' % ', '.join(valid_section_folders))
                 else:
                     result, message = self._alias_helper.is_valid_model_attribute_name(validation_location,
                                                                                        section_dict_key)
                     if result == ValidationCodes.VERSION_INVALID:
-                        if self._validation_mode == _ValidationModes.STANDALONE:
-                            validation_result.add_warning('WLSDPLY-05027', message)
-                        else:
-                            validation_result.add_error('WLSDPLY-05027', message)
+                        validation_result.add_warning('WLSDPLY-05027', message)
                     elif result == ValidationCodes.INVALID:
                         validation_result.add_error('WLSDPLY-05029', section_dict_key,
                                                     model_folder_path, '%s' % ', '.join(valid_attr_infos))
@@ -679,10 +673,7 @@ def __process_model_node(self, model_node, validation_location, validation_resul
                     result, message = self._alias_helper.is_valid_model_folder_name(validation_location, key)
                     if result == ValidationCodes.VERSION_INVALID:
                         # key is a VERSION_INVALID folder
-                        if self._validation_mode == _ValidationModes.STANDALONE:
-                            validation_result.add_warning('WLSDPLY-05027', message)
-                        else:
-                            validation_result.add_error('WLSDPLY-05027', message)
+                        validation_result.add_warning('WLSDPLY-05027', message)
                     elif result == ValidationCodes.INVALID:
                         # key is an INVALID folder
                         validation_result.add_error('WLSDPLY-05026', key, 'folder',
@@ -696,10 +687,7 @@ def __process_model_node(self, model_node, validation_location, validation_resul
                     result, message = self._alias_helper.is_valid_model_attribute_name(validation_location, key)
                     if result == ValidationCodes.VERSION_INVALID:
                         # key is a VERSION_INVALID attribute
-                        if self._validation_mode == _ValidationModes.STANDALONE:
-                            validation_result.add_warning('WLSDPLY-05027', message)
-                        else:
-                            validation_result.add_error('WLSDPLY-05027', message)
+                        validation_result.add_warning('WLSDPLY-05027', message)
                     elif result == ValidationCodes.INVALID:
                         # key is an INVALID attribute
                         validation_result.add_error('WLSDPLY-05029', key,
@@ -769,10 +757,7 @@ def __validate_attribute(self, attribute_name, attribute_value, valid_attr_infos
         else:
             result, message = self._alias_helper.is_valid_model_attribute_name(validation_location, attribute_name)
             if result == ValidationCodes.VERSION_INVALID:
-                if self._validation_mode == _ValidationModes.STANDALONE:
-                    validation_result.add_warning('WLSDPLY-05027', message)
-                else:
-                    validation_result.add_error('WLSDPLY-05027', message)
+                validation_result.add_warning('WLSDPLY-05027', message)
             elif result == ValidationCodes.INVALID:
                 validation_result.add_error('WLSDPLY-05029', attribute_name,
                                             model_folder_path, '%s' % ', '.join(valid_attr_infos))