From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 10 Mar 2020 09:57:45 +0000 (+0100)
Subject: mgr/orch: CLI: No Tracebacks for ServiceSpecValidationError
X-Git-Tag: v15.1.1~33^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=928048f960eae3e57d5a3bedcfac89705ebfa8e3;p=ceph.git

mgr/orch: CLI: No Tracebacks for ServiceSpecValidationError

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index b92dcee0d55..ee3ac31372c 100644
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -15,7 +15,8 @@ import copy
 import errno
 
 from ceph.deployment import inventory
-from ceph.deployment.service_spec import ServiceSpec, NFSServiceSpec, RGWSpec
+from ceph.deployment.service_spec import ServiceSpec, NFSServiceSpec, RGWSpec, \
+    ServiceSpecValidationError
 from ceph.deployment.drive_group import DriveGroupSpec
 
 from mgr_module import MgrModule, PersistentStoreDict, CLICommand, HandleCommandResult
@@ -60,7 +61,7 @@ def handle_exception(prefix, cmd_args, desc, perm, func):
     def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except (OrchestratorError, ImportError) as e:
+        except (OrchestratorError, ImportError, ServiceSpecValidationError) as e:
             # Do not print Traceback for expected errors.
             return HandleCommandResult(-errno.ENOENT, stderr=str(e))
         except NotImplementedError: