diff options
| author | David Zafman <dzafman@redhat.com> | 2014-12-19 22:47:32 +0100 |
|---|---|---|
| committer | David Zafman <dzafman@redhat.com> | 2015-01-15 20:23:32 +0100 |
| commit | 22b71744bb0cb56434d5f6214ccea7d81f771860 (patch) | |
| tree | fb63d23f5155a94f9d85967a31a5d9f5b0a07fb7 /src/test/ceph_objectstore_tool.py | |
| parent | ceph_objectstore_tool: Describe super_ver values (diff) | |
| download | ceph-22b71744bb0cb56434d5f6214ccea7d81f771860.tar.xz ceph-22b71744bb0cb56434d5f6214ccea7d81f771860.zip | |
ceph-objectstore-tool: Remove --pretty-format and use new --format options
Call new_formatter() with --format specified argument
Signed-off-by: David Zafman <dzafman@redhat.com>
Diffstat (limited to 'src/test/ceph_objectstore_tool.py')
| -rwxr-xr-x | src/test/ceph_objectstore_tool.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index e1870e61079..68bd11d2ddd 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -465,7 +465,7 @@ def main(argv): osd = OSDS[0] # retrieve all objects from all PGs - cmd = (CFSD_PREFIX + "--op list --pretty-format=false").format(osd=osd) + cmd = (CFSD_PREFIX + "--op list --format json").format(osd=osd) logging.debug(cmd); tmpfd = open(TMPFILE, "a") logging.debug(cmd) @@ -479,7 +479,7 @@ def main(argv): (pgid, jsondict) = json.loads(JSONOBJ[0])[0] # retrieve all objects in a given PG - cmd = (CFSD_PREFIX + "--op list --pgid {pg} --pretty-format=false").format(osd=osd, pg=pgid) + cmd = (CFSD_PREFIX + "--op list --pgid {pg} --format json").format(osd=osd, pg=pgid) logging.debug(cmd); tmpfd = open(OTHERFILE, "a") logging.debug(cmd) @@ -498,7 +498,7 @@ def main(argv): ERRORS += 1 # retrieve all objects with a given name in a given PG - cmd = (CFSD_PREFIX + "--op list --pgid {pg} {object} --pretty-format=false").format(osd=osd, pg=pgid, object=jsondict['oid']) + cmd = (CFSD_PREFIX + "--op list --pgid {pg} {object} --format json").format(osd=osd, pg=pgid, object=jsondict['oid']) logging.debug(cmd); tmpfd = open(OTHERFILE, "a") logging.debug(cmd) |