mgr/orchestrator_cli: make rgw rm take realm+zone

And adjust test accordingly

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/tasks/mgr/test_orchestrator_cli.py b/qa/tasks/mgr/test_orchestrator_cli.py
index d69901752cb8e8ee7ffae55750744f79fd12b35c..e62af60ceab66ec3b2f2748dc846ed05833fa09b 100644 (file)
--- a/qa/tasks/mgr/test_orchestrator_cli.py
+++ b/qa/tasks/mgr/test_orchestrator_cli.py
@@ -138,7 +138,7 @@ class TestOrchestratorCli(MgrTestCase):
         self._orch_cmd("mds", "rm", "foo")
 
     def test_rgw_rm(self):
-        self._orch_cmd("rgw", "rm", "foo")
+        self._orch_cmd("rgw", "rm", "myrealm", "myzone")
 
     def test_nfs_rm(self):
         self._orch_cmd("nfs", "rm", "service_name")

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index d3c5839a90b1fd2d107b95c6d958019d4486a5e0..83f9373bc157a1a5db3ecf5708e01dff98c4e690 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -500,9 +500,11 @@ Usage:
 
     @orchestrator._cli_write_command(
         'orchestrator rgw rm',
-        "name=name,type=CephString",
+        'name=realm_name,type=CephString '
+        'name=zone_name,type=CephString',
         'Remove an RGW service')
-    def _rgw_rm(self, name):
+    def _rgw_rm(self, realm_name, zone_name):
+        name = realm_name + '.' + zone_name
         completion = self.remove_rgw(name)
         self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)