diff --git a/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_deploy_manager.py b/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_deploy_manager.py index d1b41a0..a56eeb5 100644 --- a/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_deploy_manager.py +++ b/distributedcloud-client/dcmanagerclient/commands/v1/subcloud_deploy_manager.py @@ -119,12 +119,9 @@ class SubcloudDeployUpload(base.DCManagerShowOne): if val is None: continue elif not os.path.isfile(val): - error_msg = "error: argument --%s directory %s not valid" \ - % (key, val) - print(error_msg) - return - else: - files[key] = val + error_msg = f"{key} file does not exist: {val}" + raise exceptions.DCManagerClientException(error_msg) + files[key] = val if parsed_args.release is not None: data['release'] = parsed_args.release diff --git a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_deploy_manager.py b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_deploy_manager.py index 20f9965..5e3806d 100644 --- a/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_deploy_manager.py +++ b/distributedcloud-client/dcmanagerclient/tests/v1/test_subcloud_deploy_manager.py @@ -19,6 +19,7 @@ import tempfile from dcmanagerclient.api.v1 import subcloud_deploy_manager as sdm from dcmanagerclient.commands.v1 \ import subcloud_deploy_manager as subcloud_deploy_cmd +from dcmanagerclient.exceptions import DCManagerClientException from dcmanagerclient.tests import base @@ -249,12 +250,13 @@ class TestCLISubcloudDeployManagerV1(base.BaseCommandTest): tempfile.NamedTemporaryFile() as f3: file_path_2 = os.path.abspath(f2.name) file_path_3 = os.path.abspath(f3.name) - self.call( - subcloud_deploy_cmd.SubcloudDeployUpload, - app_args=[ - '--deploy-playbook', file_path_1, - '--deploy-overrides', file_path_2, - '--deploy-chart', file_path_3]) - mock_print.assert_called_with('error: argument --deploy_playbook' - ' directory not_a_valid_path not valid') + e = self.assertRaises(DCManagerClientException, + self.call, + subcloud_deploy_cmd.SubcloudDeployUpload, + app_args=['--deploy-playbook', file_path_1, + '--deploy-overrides', file_path_2, + '--deploy-chart', file_path_3]) + + self.assertTrue('deploy_playbook file does not exist: not_a_valid_path' + in str(e))