From 04423ccd2dd97303fb82fa6f1a5fbc46a73a4a77 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 26 Jul 2023 19:25:07 -0400 Subject: [PATCH] cephadm: add daemon_name property to DaemonIdentity Add a convenience property to DaemonIdentity and DaemonSubIdentity that produces a name in the ceph daemon naming convention: .. Signed-off-by: John Mulligan --- src/cephadm/cephadmlib/daemon_identity.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/cephadm/cephadmlib/daemon_identity.py b/src/cephadm/cephadmlib/daemon_identity.py index eced0edc85c..3e79e8f9f6a 100644 --- a/src/cephadm/cephadmlib/daemon_identity.py +++ b/src/cephadm/cephadmlib/daemon_identity.py @@ -33,6 +33,10 @@ class DaemonIdentity: def daemon_id(self) -> str: return self._daemon_id + @property + def daemon_name(self) -> str: + return f'{self.daemon_type}.{self.daemon_id}' + @property def legacy_container_name(self) -> str: return 'ceph-%s-%s.%s' % (self.fsid, self.daemon_type, self.daemon_id) @@ -75,6 +79,10 @@ class DaemonSubIdentity(DaemonIdentity): def subcomponent(self) -> str: return self._subcomponent + @property + def daemon_name(self) -> str: + return f'{self.daemon_type}.{self.daemon_id}.{self.subcomponent}' + @property def container_name(self) -> str: name = f'ceph-{self.fsid}-{self.daemon_type}-{self.daemon_id}-{self.subcomponent}'