mgr/orch: remove `orch spec dump`

as this is now a subset of `orch ls`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit 446ede26f3dcbaa5d9a631730c43ab9b11b38b52)

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 1a5a6ac050442af98eed550fc14c5994fcd11c23..783665c94b9ba8cb4125dd8b4ed6c4e67a55af26 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -3335,13 +3335,6 @@ receivers:
         """
         return self.rm_util.report
 
-    @trivial_completion
-    def list_specs(self, service_name=None):
-        """
-        Loads all entries from the service_spec mon_store root.
-        """
-        return self.spec_store.find(service_name=service_name)
-
 
 class BaseScheduler(object):
     """

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index b34448479c47908761f8f4eb8c55b713c39e162e..a0be9a1426382b1079c32d7e3c4f3db02950a419 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -368,7 +368,7 @@ class TestCephadm(object):
             spec = ServiceSpec('mgr', placement=ps)
             c = cephadm_module.apply_mgr(spec)
             assert wait(cephadm_module, c) == 'Scheduled mgr update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_apply_mds_save(self, cephadm_module):
@@ -377,7 +377,7 @@ class TestCephadm(object):
             spec = ServiceSpec('mds', 'fsname', placement=ps)
             c = cephadm_module.apply_mds(spec)
             assert wait(cephadm_module, c) == 'Scheduled mds update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_apply_rgw_save(self, cephadm_module):
@@ -386,7 +386,7 @@ class TestCephadm(object):
             spec = ServiceSpec('rgw', 'r.z', placement=ps)
             c = cephadm_module.apply_rgw(spec)
             assert wait(cephadm_module, c) == 'Scheduled rgw update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_apply_rbd_mirror_save(self, cephadm_module):
@@ -395,7 +395,7 @@ class TestCephadm(object):
             spec = ServiceSpec('rbd-mirror', placement=ps)
             c = cephadm_module.apply_rbd_mirror(spec)
             assert wait(cephadm_module, c) == 'Scheduled rbd-mirror update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_apply_nfs_save(self, cephadm_module):
@@ -404,7 +404,7 @@ class TestCephadm(object):
             spec = NFSServiceSpec('name', pool='pool', namespace='namespace', placement=ps)
             c = cephadm_module.apply_nfs(spec)
             assert wait(cephadm_module, c) == 'Scheduled nfs update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_apply_prometheus_save(self, cephadm_module):
@@ -413,7 +413,7 @@ class TestCephadm(object):
             spec = ServiceSpec('prometheus', placement=ps)
             c = cephadm_module.apply_prometheus(spec)
             assert wait(cephadm_module, c) == 'Scheduled prometheus update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
     def test_apply_node_exporter_save(self, cephadm_module):
@@ -422,5 +422,5 @@ class TestCephadm(object):
             spec = ServiceSpec('node-exporter', placement=ps, service_id='my_exporter')
             c = cephadm_module.apply_node_exporter(spec)
             assert wait(cephadm_module, c) == 'Scheduled node-exporter update...'
-            assert wait(cephadm_module, cephadm_module.list_specs()) == [spec]
-            assert wait(cephadm_module, cephadm_module.list_specs('node-exporter.my_exporter')) == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service())] == [spec]
+            assert [d.spec for d in wait(cephadm_module, cephadm_module.describe_service(service_name='node-exporter.my_exporter'))] == [spec]

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index 299fa541277e685cb33ee94537b61c777a5be371..8f88b66d560af756da01d819bcb32346a557cf85 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -889,13 +889,6 @@ class Orchestrator(object):
         """
         raise NotImplementedError()
 
-    def list_specs(self, service_name=None):
-        # type: (Optional[str]) -> Completion
-        """
-        Lists saved service specs
-        """
-        raise NotImplementedError()
-
     def remove_service(self, service_name):
         # type: (str) -> Completion
         """

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index c8c3c8369423e0bfa3f3b5a72fca1b60f22f24ac..2522ddcb78128e84493820488a5313db04c15156 100644 (file)
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -697,17 +697,6 @@ Usage:
         raise_if_exception(completion)
         return HandleCommandResult(stdout=completion.result_str())
 
-    @_cli_write_command(
-        'orch spec dump',
-        'name=service_name,type=CephString,req=false',
-        desc='List all Service specs')
-    def _get_service_specs(self, service_name=None):
-        completion = self.list_specs(service_name=service_name)
-        self._orchestrator_wait([completion])
-        raise_if_exception(completion)
-        specs = completion.result
-        return HandleCommandResult(stdout=yaml.safe_dump_all(specs))
-
     @_cli_write_command(
         'orch apply',
         'name=service_type,type=CephChoices,strings=mon|mgr|rbd-mirror|crash|alertmanager|grafana|node-exporter|prometheus,req=false '