From: Mykola Golub <mgolub@suse.com>
Date: Wed, 3 Jan 2018 16:41:01 +0000 (+0200)
Subject: rbd-ggate: make list command produce valid xml format output
X-Git-Tag: v13.0.2~611^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44cc02483c40888960db4551f86fa351a17ffbb6;p=ceph.git

rbd-ggate: make list command produce valid xml format output

Signed-off-by: Mykola Golub <mgolub@suse.com>
---

diff --git a/src/tools/rbd_ggate/main.cc b/src/tools/rbd_ggate/main.cc
index b16f5b40aea0..9dc501a5d3b6 100644
--- a/src/tools/rbd_ggate/main.cc
+++ b/src/tools/rbd_ggate/main.cc
@@ -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);