]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr: update rest module for pg_summary
authorJohn Spray <john.spray@redhat.com>
Sun, 31 Jul 2016 22:21:41 +0000 (23:21 +0100)
committerJohn Spray <john.spray@redhat.com>
Thu, 29 Sep 2016 16:27:02 +0000 (17:27 +0100)
...which is now generated properly from PGMap
instead of reconstituted from some JSON.

Signed-off-by: John Spray <john.spray@redhat.com>
src/pybind/mgr/rest/module.py

index bcd5a5d6a3eb1cf612ab1ebabf84aa373fe47499..e3d5ed36e7fe99a8a4d93841247b620249a3e12e 100644 (file)
@@ -124,8 +124,8 @@ class Module(MgrModule):
             obj = FsMap(data['epoch'], data)
         elif object_type == PgSummary:
             data = self.get("pg_summary")
-            self.log.debug("JSON: {0}".format(data['json']))
-            obj = PgSummary(0, json.loads(data['json']))
+            self.log.debug("JSON: {0}".format(data))
+            obj = PgSummary(0, data)
         elif object_type == Health:
             data = self.get("health")
             obj = Health(0, json.loads(data['json']))