mgr/cephadm: allow iscsi to be named by teuthology

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

diff --git a/src/pybind/mgr/cephadm/tests/test_spec.py b/src/pybind/mgr/cephadm/tests/test_spec.py
index 55001f036d86710010d3dd4fb1c574608f47b307..663e09a551d1c78f530e069f45bf199a9804d5bf 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_spec.py
+++ b/src/pybind/mgr/cephadm/tests/test_spec.py
@@ -531,6 +531,19 @@ def test_dd_octopus(dd_json):
         ),
         True
     ),
+    (
+        # fixed daemon id for teuthology.
+        IscsiServiceSpec(
+            service_type='iscsi',
+            service_id='iscsi',
+        ),
+        DaemonDescription(
+            daemon_type='iscsi',
+            daemon_id="iscsi.a",
+            hostname="host1",
+        ),
+        True
+    ),
 ])
 def test_daemon_description_service_name(spec: ServiceSpec,
                                          dd: DaemonDescription,

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index ee32fd33013eb277027d2fb8a8d8acb3b3ce3ede..117d3d0b3d6d07ea2db164ff8486e43dc52469b0 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -1291,6 +1291,10 @@ class DaemonDescription(object):
                 if len(v) in [3, 4]:
                     return '.'.join(v[0:2])
 
+            if self.daemon_type == 'iscsi':
+                v = self.daemon_id.split('.')
+                return '.'.join(v[0:-1])
+
             # daemon_id == "service_id"
             return self.daemon_id