python-common: validate ServiceSpec.service_type

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index c32d8f1cee2779a6c3654325c9d618c31282aa47..b5f8219e4179d0c70281ab46977b9acd79f99e0f 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -356,7 +356,7 @@ class TestCephadm(object):
     def test_apply_node_exporter_save(self, _save_spec, cephadm_module):
         with self._with_host(cephadm_module, 'test'):
             ps = PlacementSpec(hosts=['test'], count=1)
-            spec = ServiceSpec('node_exporter', placement=ps)
+            spec = ServiceSpec('node-exporter', placement=ps)
             c = cephadm_module.apply_node_exporter(spec)
-            assert wait(cephadm_module, c) == 'Scheduled node_exporter update...'
+            assert wait(cephadm_module, c) == 'Scheduled node-exporter update...'
             _save_spec.assert_called_with(spec)

diff --git a/src/python-common/ceph/deployment/service_spec.py b/src/python-common/ceph/deployment/service_spec.py
index ae19d739fd2895fb9ee4b08b7d57f6ea662035ae..5643d1032d03da849b2341d2fed12112b2ca51d3 100644 (file)
--- a/src/python-common/ceph/deployment/service_spec.py
+++ b/src/python-common/ceph/deployment/service_spec.py
@@ -302,6 +302,8 @@ class ServiceSpec(object):
     start the services.
 
     """
+    KNOWN_SERVICE_TYPES = 'alertmanager crash grafana mds mgr mon nfs ' \
+                          'node-exporter osd prometheus rbd-mirror rgw'.split()
 
     def __init__(self,
                  service_type,     # type: str
@@ -312,7 +314,7 @@ class ServiceSpec(object):
                  ):
         self.placement = PlacementSpec() if placement is None else placement  # type: PlacementSpec
 
-        assert service_type
+        assert service_type in ServiceSpec.KNOWN_SERVICE_TYPES, service_type
         self.service_type = service_type
         self.service_id = service_id
         self.unmanaged = unmanaged