From: John Mulligan <jmulligan@redhat.com>
Date: Wed, 13 Dec 2023 19:33:20 +0000 (-0500)
Subject: mgr/cephadm: fix test failure on newer python
X-Git-Tag: v19.1.0~82^2~22
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ced2479f4e8b3ff89c5550edeb16cc3d6a775d85;p=ceph.git

mgr/cephadm: fix test failure on newer python

Tests that touch this enum fail for me locally but pass in the CI. This
seems to be due to new enum related behavior in Python 3.11.
See: https://blog.pecar.me/python-enum
Instead of fixing it as suggested in the above blog, adding a __str__
method works on all python versions I care to know about.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
(cherry picked from commit 07b44900e8c8bef434e848bf7aa84d18d78d8bd6)
---

diff --git a/src/pybind/mgr/cephadm/utils.py b/src/pybind/mgr/cephadm/utils.py
index 3aedfbd86f008..1ba3e48454a20 100644
--- a/src/pybind/mgr/cephadm/utils.py
+++ b/src/pybind/mgr/cephadm/utils.py
@@ -57,6 +57,9 @@ class SpecialHostLabels(str, Enum):
     def to_json(self) -> str:
         return self.value
 
+    def __str__(self) -> str:
+        return self.value
+
 
 def name_to_config_section(name: str) -> ConfEntity:
     """