import ceph 14.2.5

[ceph.git] / ceph / src / pybind / mgr / orchestrator_cli / module.py

diff --git a/ceph/src/pybind/mgr/orchestrator_cli/module.py b/ceph/src/pybind/mgr/orchestrator_cli/module.py
index 458d53a0452cb36702041755a72fe8be5518e8e5..6225b5ad66b111b5e4de074c60a9f093a38673b4 100644 (file)
--- a/ceph/src/pybind/mgr/orchestrator_cli/module.py
+++ b/ceph/src/pybind/mgr/orchestrator_cli/module.py
@@ -379,7 +379,7 @@ Usage:
         """
         mgr_map = self.get("mgr_map")
 
-        if module_name == "":
+        if module_name is None or module_name == "":
             self.set_module_option("orchestrator", None)
             return HandleCommandResult()
 
@@ -429,3 +429,9 @@ Usage:
                                            o, avail,
                                            " ({0})".format(why) if not avail else ""
                                        ))
+
+    def self_test(self):
+        old_orch = self._select_orchestrator()
+        self._set_backend('')
+        assert self._select_orchestrator() is None
+        self._set_backend(old_orch)