]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-ggate: make list command produce valid xml format output 19823/head
authorMykola Golub <mgolub@suse.com>
Wed, 3 Jan 2018 16:41:01 +0000 (18:41 +0200)
committerMykola Golub <to.my.trociny@gmail.com>
Sun, 7 Jan 2018 12:44:07 +0000 (12:44 +0000)
Signed-off-by: Mykola Golub <mgolub@suse.com>
src/tools/rbd_ggate/main.cc

index b16f5b40aea0c001d34ae9c30d4e221e8d370937..9dc501a5d3b63b5155785a10c454fbba1f8a0ea3 100644 (file)
@@ -336,7 +336,7 @@ static int do_list(const std::string &format, bool pretty_format)
   }
 
   if (f) {
-    f->open_object_section("devices");
+    f->open_array_section("devices");
   } else {
     tbl.define_column("id", TextTable::LEFT, TextTable::LEFT);
     tbl.define_column("pool", TextTable::LEFT, TextTable::LEFT);
@@ -361,7 +361,8 @@ static int do_list(const std::string &format, bool pretty_format)
     parse_imgpath(info.substr(4), &poolname, &imgname, &snapname);
 
     if (f) {
-      f->open_object_section(stringify(id).c_str());
+      f->open_object_section("device");
+      f->dump_string("id", id);
       f->dump_string("pool", poolname);
       f->dump_string("image", imgname);
       f->dump_string("snap", snapname);