mgr/cephadm: rename completion variables&cleanup

Signed-off-by: Joshua Schmid <jschmid@suse.de>

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 551dac3764c1e6d405e3207fa9dd513458fc46c1..13b7de454c8db9b35f72bdcf8ab689a4f94145bf 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -955,18 +955,18 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         while self.run:
             self._check_hosts()
             self._remove_osds_bg()
-            completions = self._apply_services()
-            for completion in completions:
-                if completion:
-                    while not completion.has_result:
-                        self.process([completion])
-                        self.log.debug(f'Still processing {completion}')
-                        if completion.needs_result:
+            service_completions = self._apply_services()
+            for service_completion in service_completions:
+                if service_completion:
+                    while not service_completion.has_result:
+                        self.process([service_completion])
+                        self.log.debug(f'Still processing {service_completion}')
+                        if service_completion.needs_result:
                             time.sleep(1)
                         else:
                             break
-                    if completion.exception is not None:
-                        self.log.error(str(completion.exception))
+                    if service_completion.exception is not None:
+                        self.log.error(str(service_completion.exception))
 
             # refresh daemons
             self.log.debug('refreshing hosts')
@@ -997,16 +997,17 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             self._check_for_strays()
 
             if self.upgrade_state and not self.upgrade_state.get('paused'):
-                completion = self._do_upgrade()
-                if completion:
-                    while not completion.has_result:
-                        self.process([completion])
-                        if completion.needs_result:
+                upgrade_completion = self._do_upgrade()
+                if upgrade_completion:
+                    while not upgrade_completion.has_result:
+                        self.process([upgrade_completion])
+                        if upgrade_completion.needs_result:
                             time.sleep(1)
                         else:
                             break
-                    if completion.exception is not None:
-                        self.log.error(str(completion.exception))
+                    if upgrade_completion.exception is not None:
+                        self.log.error(str(upgrade_completion.exception))
+                self.log.debug('did _do_upgrade')
             else:
                 self._serve_sleep()
         self.log.debug("serve exit")
@@ -1604,9 +1605,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 n: str = dd.service_name()
                 if service_name and service_name != n:
                     continue
-                service_store = PersistentStoreDict(self, f'service_spec/{dd.daemon_type}')
                 try:
-                    _ = service_store[dd.service_name(without_service_type=True)]
+                    _ = self.service_spec_store[dd.service_name()]
                     spec_presence = "present"
                 except IndexError:
                     spec_presence = "absent"
@@ -1713,8 +1713,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     # TODO: bail out for OSDs when https://github.com/ceph/ceph/pull/32983 is merged
                     if dm[name].daemon_type == 'osd':
                         continue
-                    self._remove_key_from_store(dm[name].daemon_type,
-                                                dm[name].service_name(without_service_type=True))
+                    self._remove_key_from_store(dm[name].service_name())
         if not args:
             raise OrchestratorError('Unable to find daemon(s) %s' % (names))
         self.log.info('Remove daemons %s' % [a[0] for a in args])
@@ -1728,7 +1727,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     args.append(
                         (d.name(), d.hostname, force)
                     )
-                    self._remove_key_from_store(d.daemon_type, d.service_name(without_service_type=True))
+                    self._remove_key_from_store(d.service_name())
         if not args:
             raise OrchestratorError('Unable to find daemons in %s service' % (
                 service_name))
@@ -1736,13 +1735,9 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             service_name, [a[0] for a in args]))
         return self._remove_daemon(args)
 
-    def _remove_key_from_store(self, service_type: str, name: str) -> None:
-        self.log.debug(f"Removing {name} from the service_spec store")
-        try:
-            store = PersistentStoreDict(self, f'service_spec/{service_type}')
-            del store[name]
-        except IndexError:
-            self.log.debug(f"{service_type}/{name} not found in store. Can't remove.")
+    def _remove_key_from_store(self, spec_name: str) -> None:
+        self.log.debug(f"Removing {spec_name} from the service_spec store")
+        del self.service_spec_store[spec_name]
 
     def get_inventory(self, host_filter=None, refresh=False):
         """
@@ -2074,9 +2069,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             raise OrchestratorError('must specify host(s) to deploy on')
         if not spec.placement.count:
             spec.placement.count = len(spec.placement.hosts)
-        service_name = daemon_type
-        if spec.name:
-            service_name += '.' + spec.name
+        # TODO: rename service_name to spec.name if works
+        service_name = spec.name
         daemons = self.cache.get_daemons_by_service(service_name)
         return self._create_daemons(daemon_type, spec, daemons,
                                     create_func, config_func)
@@ -2165,7 +2159,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
     def apply_mgr(self, spec):
         self.save_spec(spec)
         self._kick_serve_loop()
-        return trivial_result("scheduled MGR creation..")
+        return trivial_result("Scheduled MGR creation..")
 
     def _apply_mgr(self, spec):
         # type: (orchestrator.ServiceSpec) -> AsyncCompletion
@@ -2178,7 +2172,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
     def apply_mds(self, spec: orchestrator.ServiceSpec) -> orchestrator.Completion:
         self.save_spec(spec)
         self._kick_serve_loop()
-        return trivial_result("scheduled MDS creation..")
+        return trivial_result("Scheduled MDS creation..")
 
     def _apply_mds(self, spec):
         # type: (orchestrator.ServiceSpec) -> AsyncCompletion
@@ -2239,7 +2233,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
     def apply_rgw(self, spec):
         self.save_spec(spec)
         self._kick_serve_loop()
-        return trivial_result("scheduled RGW creation..")
+        return trivial_result("Scheduled RGW creation..")
 
     def _apply_rgw(self, spec):
         # type: (orchestrator.ServiceSpec) -> AsyncCompletion
@@ -2263,7 +2257,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
     def apply_rbd_mirror(self, spec):
         self.save_spec(spec)
         self._kick_serve_loop()
-        return trivial_result("scheduled rbd-mirror creation..")
+        return trivial_result("Scheduled rbd-mirror creation..")
 
     def _apply_rbd_mirror(self, spec):
         # type: (orchestrator.ServiceSpec) -> AsyncCompletion
@@ -2472,7 +2466,7 @@ receivers:
     def apply_prometheus(self, spec):
         self.save_spec(spec)
         self._kick_serve_loop()
-        return trivial_result("scheduled prometheus creation..")
+        return trivial_result("Scheduled prometheus creation..")
 
     def add_node_exporter(self, spec):
         # type: (orchestrator.ServiceSpec) -> AsyncCompletion
@@ -2482,7 +2476,7 @@ receivers:
     def apply_node_exporter(self, spec):
         self.save_spec(spec)
         self._kick_serve_loop()
-        return trivial_result("scheduled node-exporter creation..")
+        return trivial_result("Scheduled node-exporter creation..")
 
     def _apply_node_exporter(self, spec):
         # type: (orchestrator.ServiceSpec) -> AsyncCompletion
@@ -2758,16 +2752,15 @@ receivers:
 
          Raises `OrchestratorError` if an entry with the same named identifier already exist to prevent overwrites from two different sources.
         """
-        store = PersistentStoreDict(self, f'service_spec/{spec.service_type}')
-        name: str = spec.name or spec.service_type
+        full_spec_name = f"{spec.service_type}.{spec.name}"
         try:
-            _ = store[name]
-            raise orchestrator.OrchestratorError(f"Specification for {name} already exists. "
+            _ = self.service_spec_store[full_spec_name]
+            raise orchestrator.OrchestratorError(f"Specification for {full_spec_name} already exists. "
                                                  "Please review your existing specs with "
-                                                 "`ceph orch servicespecs ls` and try again.")
+                                                 "`ceph orch spec dump` and try again.")
         except IndexError:
-            self.log.info(f"New spec found. Saving <{name}> to the store.")
-            store[name] = spec.to_json()
+            self.log.info(f"New spec found. Saving <{full_spec_name}> to the store.")
+            _ = self.service_spec_store[full_spec_name] = spec.to_json()
 
     def list_specs(self) -> orchestrator.Completion:
         """
@@ -2779,13 +2772,6 @@ receivers:
             specs.append(yaml.dump(spec))
         return trivial_result(specs)
 
-    def clear_all_specs(self) -> orchestrator.Completion:
-        """
-        Clears the service_spec root in the mon_store (mgr/cephadm/service_specs/)
-        """
-        self.service_spec_store.clear()
-        return trivial_result(f"Mon store for {self.service_spec_store.prefix} cleared")
-
     def apply_service_config(self, spec_document: str) -> orchestrator.Completion:
         """
         Parse a multi document yaml file (represented in a inbuf object)
@@ -2795,10 +2781,13 @@ receivers:
         """
         content: Iterator[Any] = yaml.load_all(spec_document)
         # Load all specs from a multi document yaml file.
+        loaded_specs: List[ServiceSpec] = list()
         for spec in content:
             # load ServiceSpec once to validate
             spec_o = ServiceSpec.from_json(spec)
-            self.save_spec(spec_o)
+            loaded_specs.append(spec_o)
+        for spec in loaded_specs:
+            self.save_spec(spec)
         self._kick_serve_loop()
         return trivial_result("ServiceSpecs saved")
 
@@ -2826,16 +2815,16 @@ receivers:
         """
         specs = list()
         self.log.debug(f"Checking for type {find_service_type}")
-        store = PersistentStoreDict(self, f'service_spec/{find_service_type}')
-        for service_type, json_specs in store.items():
-
+        for spec_key, json_specs in self.service_spec_store.items():
+            if not spec_key.split('.')[0].startswith(find_service_type):
+                continue
             if isinstance(json_specs, dict):
                 self.log.debug(f"Found dict in json_specs: No need to decode")
             elif isinstance(json_specs, str):
                 self.log.debug(f"Found str in json_specs: Decoding from json")
                 json_specs = json.loads(json_specs)
 
-            self.log.debug(f"Found service_type: {service_type} in the k-v store. Adding..")
+            self.log.debug(f"Found service_type: {spec_key} in the k-v store. Adding..")
             specs.append(ServiceSpec.from_json(json_specs))
         self.log.debug(f"Found {specs} specs.")
         return specs

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index 3976dc1030b761c26e9bfe8cd5ce1dda45289175..bdcdb32cbb6b2465c2cc6eb8cccb32001b114bf9 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -202,7 +202,7 @@ class TestCephadm(object):
     def test_mds(self, _send_command, _get_connection, _save_host, _rm_host, cephadm_module):
         with self._with_host(cephadm_module, 'test'):
             ps = PlacementSpec(hosts=['test'], count=1)
-            c = cephadm_module.add_mds(ServiceSpec('name', placement=ps, service_type='mds'))
+            c = cephadm_module.add_mds(ServiceSpec(name='name', placement=ps, service_type='mds'))
             [out] = wait(cephadm_module, c)
             match_glob(out, "Deployed mds.name.* on host 'test'")
 
@@ -286,7 +286,7 @@ class TestCephadm(object):
     @mock.patch("cephadm.module.HostCache.save_host")
     @mock.patch("cephadm.module.HostCache.rm_host")
     @mock.patch("cephadm.module.CephadmOrchestrator._remove_key_from_store")
-    def test_remove_daemon(self, _save_host, _rm_host, _save_spec, cephadm_module):
+    def test_remove_daemon(self, rm_key, _rm_host, _save_spec, cephadm_module):
         with self._with_host(cephadm_module, 'test'):
             c = cephadm_module.list_daemons(refresh=True)
             wait(cephadm_module, c)
@@ -309,7 +309,7 @@ class TestCephadm(object):
     @mock.patch("cephadm.module.HostCache.save_host")
     @mock.patch("cephadm.module.HostCache.rm_host")
     @mock.patch("cephadm.module.CephadmOrchestrator._remove_key_from_store")
-    def test_remove_service(self, _save_host, _rm_host, _save_spec, cephadm_module):
+    def test_remove_service(self, _rm_key, _rm_host, _save_spec, cephadm_module):
         with self._with_host(cephadm_module, 'test'):
             c = cephadm_module.list_daemons(refresh=True)
             wait(cephadm_module, c)
@@ -387,7 +387,7 @@ class TestCephadm(object):
         with self._with_host(cephadm_module, 'test'):
             ps = PlacementSpec(hosts=['test'], count=1)
 
-            c = cephadm_module.add_alertmanager(ServiceSpec(placement=ps))
+            c = cephadm_module.add_alertmanager(ServiceSpec(placement=ps, service_type='alertmanager'))
             [out] = wait(cephadm_module, c)
             match_glob(out, "Deployed alertmanager.* on host 'test'")
 
@@ -401,3 +401,156 @@ class TestCephadm(object):
         with self._with_host(cephadm_module, 'test'):
             c = cephadm_module.blink_device_light('ident', True, [('test', '', '')])
             assert wait(cephadm_module, c) == ['Set ident light for test: on']
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    def test_apply_mgr_save(self, _send_command, _get_connection, _save_spec, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            ps = PlacementSpec(hosts=['test'], count=1)
+            spec = ServiceSpec(placement=ps, service_type='mgr')
+            c = cephadm_module.apply_mgr(spec)
+            _save_spec.assert_called_with(spec)
+            assert wait(cephadm_module, c) == 'Scheduled MGR creation..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    def test_apply_mds_save(self, _send_command, _get_connection, _save_spec, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            ps = PlacementSpec(hosts=['test'], count=1)
+            spec = ServiceSpec(placement=ps, service_type='mds')
+            c = cephadm_module.apply_mds(spec)
+            _save_spec.assert_called_with(spec)
+            assert wait(cephadm_module, c) == 'Scheduled MDS creation..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    def test_apply_rgw_save(self, _send_command, _get_connection, _save_spec, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            ps = PlacementSpec(hosts=['test'], count=1)
+            spec = ServiceSpec(placement=ps, service_type='rgw')
+            c = cephadm_module.apply_rgw(spec)
+            _save_spec.assert_called_with(spec)
+            assert wait(cephadm_module, c) == 'Scheduled RGW creation..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    def test_apply_rbd_mirror_save(self, _send_command, _get_connection, _save_spec, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            ps = PlacementSpec(hosts=['test'], count=1)
+            spec = ServiceSpec(placement=ps, service_type='rbd-mirror')
+            c = cephadm_module.apply_rbd_mirror(spec)
+            _save_spec.assert_called_with(spec)
+            assert wait(cephadm_module, c) == 'Scheduled rbd-mirror creation..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    def test_apply_prometheus_save(self, _send_command, _get_connection, _save_spec, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            ps = PlacementSpec(hosts=['test'], count=1)
+            spec = ServiceSpec(placement=ps, service_type='prometheus')
+            c = cephadm_module.apply_prometheus(spec)
+            _save_spec.assert_called_with(spec)
+            assert wait(cephadm_module, c) == 'Scheduled prometheus creation..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    def test_apply_node_exporter_save(self, _send_command, _get_connection, _save_spec, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            ps = PlacementSpec(hosts=['test'], count=1)
+            spec = ServiceSpec(placement=ps, service_type='node_exporter')
+            c = cephadm_module.apply_node_exporter(spec)
+            _save_spec.assert_called_with(spec)
+            assert wait(cephadm_module, c) == 'Scheduled node-exporter creation..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.CephadmOrchestrator.save_spec")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    @mock.patch("cephadm.module.yaml.load_all", return_value=[{'service_type': 'rgw', 'placement': {'count': 1}, 'spec': {'rgw_realm': 'realm1', 'rgw_zone': 'zone1'}}])
+    @mock.patch("cephadm.module.ServiceSpec")
+    def test_apply_service_config(self, _sspec, _yaml, _send_command, _get_connection, _save_spec, _save_host,
+                                  _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            c = cephadm_module.apply_service_config('dummy')
+            _save_spec.assert_called_once()
+            _sspec.from_json.assert_called_once()
+            assert wait(cephadm_module, c) == 'ServiceSpecs saved'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    @mock.patch("cephadm.module.CephadmOrchestrator.find_json_specs")
+    def test_trigger_deployment_todo(self, _find_json_spec, _send_command, _get_connection, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            _find_json_spec.return_value = ['something']
+            c = cephadm_module.trigger_deployment('foo', lambda x: x)
+            _find_json_spec.assert_called_with('foo')
+            assert c == ['something']
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    @mock.patch("cephadm.module.CephadmOrchestrator.find_json_specs")
+    def test_trigger_deployment_no_todo(self, _find_json_spec, _send_command, _get_connection, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            _find_json_spec.return_value = []
+            c = cephadm_module.trigger_deployment('foo', lambda x: x)
+            _find_json_spec.assert_called_with('foo')
+            assert wait(cephadm_module, c[0]) == 'Nothing to do..'
+
+    @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.send_command")
+    @mock.patch("cephadm.module.CephadmOrchestrator.mon_command", mon_command)
+    @mock.patch("cephadm.module.CephadmOrchestrator._get_connection")
+    @mock.patch("cephadm.module.HostCache.save_host")
+    @mock.patch("cephadm.module.HostCache.rm_host")
+    @mock.patch("cephadm.module.CephadmOrchestrator.trigger_deployment")
+    def test_apply_services(self, _trigger_deployment, _send_command, _get_connection, _save_host, _rm_host, cephadm_module):
+        with self._with_host(cephadm_module, 'test'):
+            c = cephadm_module._apply_services()
+            _trigger_deployment.assert_any_call('mgr', cephadm_module._apply_mgr)
+            _trigger_deployment.assert_any_call('prometheus', cephadm_module._apply_prometheus)
+            _trigger_deployment.assert_any_call('node-exporter', cephadm_module._apply_node_exporter)
+            _trigger_deployment.assert_any_call('mds', cephadm_module._apply_mds)
+            _trigger_deployment.assert_any_call('rgw', cephadm_module._apply_rgw)
+            _trigger_deployment.assert_any_call('rbd-mirror', cephadm_module._apply_rbd_mirror)
+            assert isinstance(c, list)

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index b5bc21cbe90fbe6c4ea81cd71725e809f2d3eb1e..1fe44aee63030e17ce1ea65fcb42c6b6d00bbf8d 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -936,13 +936,6 @@ class Orchestrator(object):
         """
         raise NotImplementedError()
 
-    def clear_all_specs(self):
-        # type: () -> Completion
-        """
-        Lists saved service specs
-        """
-        raise NotImplementedError()
-
     def remove_service(self, service_name):
         # type: (str) -> Completion
         """
@@ -1404,17 +1397,13 @@ class DaemonDescription(object):
             return self.name().startswith(service_name + '.')
         return False
 
-    def service_name(self, without_service_type=False):
+    def service_name(self):
         if self.daemon_type == 'rgw':
             v = self.daemon_id.split('.')
             s_name = '.'.join(v[0:2])
-            if without_service_type:
-                return s_name
             return 'rgw.%s' % s_name
         if self.daemon_type in ['mds', 'nfs']:
             _s_name = self.daemon_id.split('.')[0]
-            if without_service_type:
-                return _s_name
             return 'mds.%s' % _s_name
         return self.daemon_type
 
@@ -1550,13 +1539,13 @@ class ServiceSpec(object):
         # type: (Optional[str], Optional[PlacementSpec], Optional[str], Optional[int]) -> None
         self.placement = PlacementSpec() if placement is None else placement  # type: PlacementSpec
 
+        assert service_type
+        self.service_type = service_type
+
         #: Give this set of stateless services a name: typically it would
         #: be the name of a CephFS filesystem, RGW zone, etc.  Must be unique
         #: within one ceph cluster. Note: Not all clusters have a name
-        self.name = name  # type: Optional[str]
-
-        assert service_type
-        self.service_type = service_type
+        self.name = name or service_type
 
         if self.placement is not None and self.placement.count is not None:
             #: Count of service instances. Deprecated.
@@ -1634,7 +1623,6 @@ class NFSServiceSpec(ServiceSpec):
         if not self.pool:
             raise OrchestratorValidationError('Cannot add NFS: No Pool specified')
 
-
 class RGWSpec(ServiceSpec):
     """
     Settings to configure a (multisite) Ceph RGW
@@ -1662,8 +1650,7 @@ class RGWSpec(ServiceSpec):
         # default values that makes sense for Ansible. Rook has default values implemented
         # in Rook itself. Thus we don't set any defaults here in this class.
 
-        super(RGWSpec, self).__init__(name=rgw_realm + '.' + rgw_zone,
-                                      placement=placement, service_type=service_type)
+        super(RGWSpec, self).__init__(name=rgw_realm+'.'+rgw_zone, placement=placement, service_type=service_type)
 
         #: List of hosts where RGWs should run. Not for Rook.
         if hosts:

diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py
index 738966c177aa200f2425d2a87fd78ddba22f7a49..2302e14e8c950daec51afb7b93354e90935515e1 100644 (file)
--- a/src/pybind/mgr/orchestrator/module.py
+++ b/src/pybind/mgr/orchestrator/module.py
@@ -739,16 +739,6 @@ Usage:
         specs = completion.result_str()
         return HandleCommandResult(stdout=specs)
 
-    @_cli_write_command(
-        'orch servicespecs clear',
-        desc='Clear all Service specs')
-    def _clear_service_specs(self):
-        completion = self.clear_all_specs()
-        self._orchestrator_wait([completion])
-        raise_if_exception(completion)
-        return HandleCommandResult(stdout=completion.result_str())
-
-
     @_cli_write_command(
         'orch apply mgr',
         "name=num,type=CephInt,req=false "