From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 15 Nov 2018 19:10:53 +0000 (-0500)
Subject: orchestrator_cli: add a service rm command
X-Git-Tag: v14.1.0~739^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39931808f9359364b3e0d0eee9e57d6c4bf71a00;p=ceph.git

orchestrator_cli: add a service rm command

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

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 59934bec931..87972d66ef5 100644
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -41,6 +41,13 @@ class OrchestratorCli(MgrModule):
             "desc": "Create a service of any type",
             "perm": "rw"
         },
+        {
+            'cmd': "orchestrator service rm "
+                   "name=svc_type,type=CephString "
+                   "name=svc_id,type=CephString ",
+            "desc": "Remove a service",
+            "perm": "rw"
+        },
         {
             'cmd': "orchestrator set backend "
                    "name=module,type=CephString,req=true",
@@ -249,6 +256,14 @@ class OrchestratorCli(MgrModule):
         else:
             raise NotImplementedError(svc_type)
 
+    def _service_rm(self, cmd):
+        svc_type = cmd['svc_type']
+        svc_id = cmd['svc_id']
+
+        completion = self._oremote("remove_stateless_service", svc_type, svc_id)
+        self._wait([completion])
+        return HandleCommandResult(rs="Success.")
+
     def _set_backend(self, cmd):
         """
         We implement a setter command instead of just having the user
@@ -330,6 +345,8 @@ class OrchestratorCli(MgrModule):
             return self._service_status(cmd)
         elif cmd['prefix'] == "orchestrator service add":
             return self._service_add(cmd)
+        elif cmd['prefix'] == "orchestrator service rm":
+            return self._service_rm(cmd)
         elif cmd['prefix'] == "orchestrator set backend":
             return self._set_backend(cmd)
         elif cmd['prefix'] == "orchestrator status":