mgr/orchestrator: move NoOrchestrator definition to base orchestrator.py

Signed-off-by: Jeff Layton <jlayton@redhat.com>

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 9b3daabb3b4d4732e4c720866a08abe38278f996..d67f7996edc2ce977b7c7e5126f28ec6cfe230c8 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -18,6 +18,10 @@ except ImportError:
 import time
 import fnmatch
 
+class NoOrchestrator(Exception):
+    def __init__(self):
+        super(NoOrchestrator, self).__init__("No orchestrator configured (try "
+                                             "`ceph orchestrator set backend`)")
 
 class _Completion(G):
     @property

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 211b6c957ac3711cca76e62ac72fde185ccd9799..7fad8bbedd11edc02e82822b01a49b812e0d9020 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -13,19 +13,13 @@ from mgr_module import MgrModule, HandleCommandResult, CLIWriteCommand, CLIReadC
 import orchestrator
 
 
-class NoOrchestrator(Exception):
-    def __init__(self):
-        super(NoOrchestrator, self).__init__("No orchestrator configured (try "
-                                             "`ceph orchestrator set backend`)")
-
-
 def handle_exceptions(func):
 
     @wraps(func)
     def inner(*args, **kwargs):
         try:
             return func(*args, **kwargs)
-        except (NoOrchestrator, ImportError) as e:
+        except (orchestrator.NoOrchestrator, ImportError) as e:
             return HandleCommandResult(-errno.ENOENT, stderr=str(e))
     return inner