From 4b8384f0638b6138abed5264e3c9688350fa9987 Mon Sep 17 00:00:00 2001 From: Joshua Schmid Date: Fri, 31 Jul 2020 13:33:24 +0200 Subject: [PATCH] mgr/cephadm: correct to_json output from str->dict Signed-off-by: Joshua Schmid --- src/pybind/mgr/cephadm/services/osd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py index 3a7297bdc442f..b1c3edbf5bc3b 100644 --- a/src/pybind/mgr/cephadm/services/osd.py +++ b/src/pybind/mgr/cephadm/services/osd.py @@ -605,7 +605,7 @@ class OSD: def pg_count_str(self): return 'n/a' if self.get_pg_count() < 0 else str(self.get_pg_count()) - def to_json(self) -> str: + def to_json(self) -> dict: out = dict() out['osd_id'] = self.osd_id out['started'] = self.started @@ -620,7 +620,7 @@ class OSD: out[k] = getattr(self, k).strftime(DATEFMT) else: out[k] = getattr(self, k) - return json.dumps(out) + return out @classmethod def from_json(cls, inp: Optional[Dict[str, Any]], ctx: Optional[RemoveUtil] = None) -> Optional["OSD"]: -- 2.39.5