From: Joshua Schmid <jschmid@suse.de>
Date: Fri, 31 Jul 2020 11:33:24 +0000 (+0200)
Subject: mgr/cephadm: correct to_json output from str->dict
X-Git-Tag: v16.1.0~1519^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F36391%2Fhead;p=ceph.git

mgr/cephadm: correct to_json output from str->dict

Signed-off-by: Joshua Schmid <jschmid@suse.de>
---

diff --git a/src/pybind/mgr/cephadm/services/osd.py b/src/pybind/mgr/cephadm/services/osd.py
index 3a7297bdc442..b1c3edbf5bc3 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"]: