From: Sébastien Han <seb@redhat.com>
Date: Wed, 17 Mar 2021 10:08:09 +0000 (+0100)
Subject: mgr/pybind/snap_schedule: return valid json for 'status' command
X-Git-Tag: v16.2.5~79^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dd367e2814d07b10ab323237c0a68f8cefdc99ae;p=ceph.git

mgr/pybind/snap_schedule: return valid json for 'status' command

The status should return a valid list, prior to this path the code was
only appending json blob next to each other resulting in an invalid
json. Now the blobs will be enclosed properly so a valid list is
returned.

Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit bf115b49b93cec85ad4fe408d622e5d60d8fbd51)
---

diff --git a/src/pybind/mgr/snap_schedule/module.py b/src/pybind/mgr/snap_schedule/module.py
index 405fb895692b..701c1551e4f5 100644
--- a/src/pybind/mgr/snap_schedule/module.py
+++ b/src/pybind/mgr/snap_schedule/module.py
@@ -73,7 +73,7 @@ class Module(MgrModule):
             return e.to_tuple()
         if format == 'json':
             json_report = ','.join([ret_sched.report_json() for ret_sched in ret_scheds])
-            return 0, f'{json_report}', ''
+            return 0, f'[{json_report}]', ''
         return 0, '\n===\n'.join([ret_sched.report() for ret_sched in ret_scheds]), ''
 
     @CLIReadCommand('fs snap-schedule list')