JIRA WDT-449 - allow no model present for standalone validate with lax method (#697)

Author: rakillen

core/src/main/python/validate.py

@@ -5,7 +5,6 @@
 The WLS Deploy tooling entry point for the validateModel tool.
 """
 import copy
-import os
 import sys
 from java.util.logging import Level
 
@@ -26,6 +25,7 @@
 from wlsdeploy.tool.util import model_context_helper
 from wlsdeploy.tool.validate.validator import Validator
 from wlsdeploy.util import cla_helper
+from wlsdeploy.util import dictionary_utils
 from wlsdeploy.util import tool_exit
 from wlsdeploy.util import variables
 from wlsdeploy.util.cla_utils import CommandLineArgUtil
@@ -68,16 +68,26 @@ def __process_args(args):
     return model_context_helper.create_context(_program_name, argument_map)
 
 
-def __process_model_args(optional_arg_map):
+def __process_model_args(argument_map):
     """
     Determine if the model file was passed separately or requires extraction from the archive.
-    :param optional_arg_map: the optional arguments map
+    :param argument_map: the arguments map
     :raises CLAException: if the arguments were not valid or an error occurred extracting the model from the archive
     """
     _method_name = '__process_model_args'
 
-    cla_helper.validate_optional_archive(_program_name, optional_arg_map)
-    cla_helper.validate_model_present(_program_name, optional_arg_map)
+    cla_helper.validate_optional_archive(_program_name, argument_map)
+
+    try:
+        cla_helper.validate_model_present(_program_name, argument_map)
+    except CLAException, ce:
+        # in lax validation mode, if no model is found, log at INFO and exit
+        method = dictionary_utils.get_element(argument_map, CommandLineArgUtil.VALIDATION_METHOD)
+        if method == CommandLineArgUtil.LAX_VALIDATION_METHOD:
+            __logger.info('WLSDPLY-20032', _program_name, class_name=_class_name, method_name=_method_name)
+            model_context = model_context_helper.create_exit_context(_program_name)
+            tool_exit.end(model_context, CommandLineArgUtil.PROG_OK_EXIT_CODE)
+        raise ce
     return
 
 

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

@@ -108,6 +108,10 @@ class CommandLineArgUtil(object):
     ARCHIVE_FILES_SEPARATOR = ','
     MODEL_FILES_SEPARATOR = ','
 
+    LAX_VALIDATION_METHOD = 'lax'
+    STRICT_VALIDATION_METHOD = 'strict'
+    VALIDATION_METHODS = [LAX_VALIDATION_METHOD, STRICT_VALIDATION_METHOD]
+
     HELP_EXIT_CODE                 = 100
     USAGE_ERROR_EXIT_CODE          = 99
     ARG_VALIDATION_ERROR_EXIT_CODE = 98
@@ -783,8 +787,8 @@ def _validate_validate_method_arg(self, value):
             ex.setExitCode(self.ARG_VALIDATION_ERROR_EXIT_CODE)
             self._logger.throwing(ex, class_name=self._class_name, method_name=method_name)
             raise ex
-        elif value.lower() != 'strict' and value.lower() != 'lax':
-            ex = exception_helper.create_cla_exception('WLSDPLY-20030', value, "strict, or lax")
+        elif value not in self.VALIDATION_METHODS:
+            ex = exception_helper.create_cla_exception('WLSDPLY-20030', value, self.VALIDATION_METHODS)
             ex.setExitCode(self.ARG_VALIDATION_ERROR_EXIT_CODE)
             self._logger.throwing(ex, class_name=self._class_name, method_name=method_name)
             raise ex
@@ -1068,7 +1072,7 @@ def _validate_target_arg(self, value):
                 config_dictionary = eval(file_handle.read())
                 target_configuration = TargetConfiguration(config_dictionary)
                 validation_method = target_configuration.get_validation_method()
-                if (validation_method is not None) and (validation_method not in ['strict', 'lax']):
+                if (validation_method is not None) and (validation_method not in self.VALIDATION_METHODS):
                     ex = exception_helper.create_cla_exception('WLSDPLY-01645', target_configuration_file)
                     ex.setExitCode(self.ARG_VALIDATION_ERROR_EXIT_CODE)
                     self._logger.throwing(ex, class_name=self._class_name, method_name=method_name)

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

@@ -1519,6 +1519,7 @@ WLSDPLY-20028=Failed to read the OPSS wallet passphrase input from the user: {0}
 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
 
 # Common messages used for tool exit and clean-up
 WLSDPLY-21000={0} Messages: