From: songweibin <song.weibin@zte.com.cn>
Date: Wed, 31 Jan 2018 05:46:06 +0000 (+0800)
Subject: rbd: add open/close section when listing group images
X-Git-Tag: v13.0.2~372^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3041b9af1a504cf6505688ed834eceebdf76d1d7;p=ceph.git

rbd: add open/close section when listing group images

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index 336a07df7679..88badde20640 100644
--- a/src/tools/rbd/action/Group.cc
+++ b/src/tools/rbd/action/Group.cc
@@ -318,9 +318,11 @@ int execute_list_images(const po::variables_map &vm,
     }
 
     if (f) {
-      f->dump_string("image name", image_name);
+      f->open_object_section("image");
+      f->dump_string("image", image_name);
       f->dump_string("pool", pool_name);
       f->dump_int("state", state);
+      f->close_section();
     } else
       std::cout << pool_name << "/" << image_name << " " << state_string << std::endl;
   }
@@ -511,7 +513,7 @@ int execute_group_snap_list(const po::variables_map &vm,
     }
     if (f) {
       f->open_object_section("group_snap");
-      f->dump_string("snap name", snap_name);
+      f->dump_string("snapshot", snap_name);
       f->dump_string("state", state_string);
       f->close_section();
     } else {