Merge pull request #241 from oracle/jira-wdt-006-no-model

JIRA WDT-006 Log descriptive error for case where model is not found

Author: CarolynRountree

core/src/main/python/create.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 
 The main module for the WLSDeploy tool to create empty domains.
@@ -193,8 +193,15 @@ def __process_model_args(optional_arg_map):
         try:
             archive_file = WLSDeployArchive(archive_file_name)
             __tmp_model_dir = FileUtils.createTempDirectory(_program_name)
-            tmp_model_file = \
-                FileUtils.fixupFileSeparatorsForJython(archive_file.extractModel(__tmp_model_dir).getAbsolutePath())
+            tmp_model_raw_file = archive_file.extractModel(__tmp_model_dir)
+            if not tmp_model_raw_file:
+                ex = exception_helper.create_cla_exception('WLSDPLY-20026', _program_name, archive_file_name,
+                                                           CommandLineArgUtil.MODEL_FILE_SWITCH)
+                ex.setExitCode(CommandLineArgUtil.ARG_VALIDATION_ERROR_EXIT_CODE)
+                __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                raise ex
+
+            tmp_model_file = FileUtils.fixupFileSeparatorsForJython(tmp_model_raw_file.getAbsolutePath())
         except (IllegalArgumentException, IllegalStateException, WLSDeployArchiveIOException), archex:
             ex = exception_helper.create_cla_exception('WLSDPLY-20010', _program_name, archive_file_name,
                                                        archex.getLocalizedMessage(), error=archex)

core/src/main/python/deploy.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 
 The entry point for the deployApps tool.
@@ -171,8 +171,15 @@ def __process_model_args(optional_arg_map):
         try:
             archive_file = WLSDeployArchive(archive_file_name)
             __tmp_model_dir = FileUtils.createTempDirectory(_program_name)
-            model_file_name = \
-                FileUtils.fixupFileSeparatorsForJython(archive_file.extractModel(__tmp_model_dir).getAbsolutePath())
+            tmp_model_raw_file = archive_file.extractModel(__tmp_model_dir)
+            if not tmp_model_raw_file:
+                ex = exception_helper.create_cla_exception('WLSDPLY-20026', _program_name, archive_file_name,
+                                                           CommandLineArgUtil.MODEL_FILE_SWITCH)
+                ex.setExitCode(CommandLineArgUtil.ARG_VALIDATION_ERROR_EXIT_CODE)
+                __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                raise ex
+
+            model_file_name = FileUtils.fixupFileSeparatorsForJython(tmp_model_raw_file.getAbsolutePath())
         except (IllegalArgumentException, IllegalStateException, WLSDeployArchiveIOException), archex:
             ex = exception_helper.create_cla_exception('WLSDPLY-20010', _program_name, archive_file_name,
                                                        archex.getLocalizedMessage(), error=archex)

core/src/main/python/update.py

@@ -1,5 +1,5 @@
 """
-Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 The Universal Permissive License (UPL), Version 1.0
 
 The entry point for the updateDomain tool.
@@ -183,8 +183,15 @@ def __process_model_args(optional_arg_map):
         try:
             archive_file = WLSDeployArchive(archive_file_name)
             __tmp_model_dir = FileUtils.createTempDirectory(_program_name)
-            model_file_name = \
-                FileUtils.fixupFileSeparatorsForJython(archive_file.extractModel(__tmp_model_dir).getAbsolutePath())
+            tmp_model_raw_file = archive_file.extractModel(__tmp_model_dir)
+            if not tmp_model_raw_file:
+                ex = exception_helper.create_cla_exception('WLSDPLY-20026', _program_name, archive_file_name,
+                                                           CommandLineArgUtil.MODEL_FILE_SWITCH)
+                ex.setExitCode(CommandLineArgUtil.ARG_VALIDATION_ERROR_EXIT_CODE)
+                __logger.throwing(ex, class_name=_class_name, method_name=_method_name)
+                raise ex
+
+            model_file_name = FileUtils.fixupFileSeparatorsForJython(tmp_model_raw_file.getAbsolutePath())
         except (IllegalArgumentException, IllegalStateException, WLSDeployArchiveIOException), archex:
             ex = exception_helper.create_cla_exception('WLSDPLY-20010', _program_name, archive_file_name,
                                                        archex.getLocalizedMessage(), error=archex)

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

@@ -1254,6 +1254,7 @@ WLSDPLY-20022=Error loading filter path {0}
 WLSDPLY-20023={0} unable to add model file {1} to archive as {2}: {3}
 WLSDPLY-20024={0} failed to persist the model to the archive file {1}: {2}
 WLSDPLY-20025=For {0}, specify the {1} or {2} argument, but not both
+WLSDPLY-20026={0} failed to find a model file in archive {1}, and {2} argument not specified
 
 # Common messages used for tool exit and clean-up
 WLSDPLY-21000={0} Messages: