From 11ff4842a207c82dd4ec8254aa370962cde24c82 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 23 Apr 2021 15:13:05 -0400 Subject: [PATCH] mgr/cephadm: include service_name is generated DaemonDescription This makes 'orch ls' match up daemosn to services (and probably cleans up other bits and pieces) when the old daemon id -> service name calc code can't do its thing. Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/services/cephadmservice.py | 1 + src/pybind/mgr/cephadm/tests/test_cephadm.py | 1 + 2 files changed, 2 insertions(+) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index 0ce23170b7774..fee4820411b98 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -94,6 +94,7 @@ class CephadmDaemonDeploySpec: return DaemonDescription( daemon_type=self.daemon_type, daemon_id=self.daemon_id, + service_name=self.service_name, hostname=self.host, status=status, status_desc=status_desc, diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py index 3e333ac7bdd86..adb07d878569c 100644 --- a/src/pybind/mgr/cephadm/tests/test_cephadm.py +++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py @@ -117,6 +117,7 @@ class TestCephadm(object): assert [remove_id_events(dd) for dd in wait(cephadm_module, c)] == [ { + 'service_name': 'mds.name', 'daemon_type': 'mds', 'hostname': 'test', 'status': 1, -- 2.39.5