From: Loic Dachary <ldachary@redhat.com>
Date: Fri, 28 Nov 2014 15:08:49 +0000 (+0100)
Subject: common: admin sock output XML elements whitespace
X-Git-Tag: v0.92~32^2~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8658911d658b860128b1b102f2565f151738ef96;p=ceph.git

common: admin sock output XML elements whitespace

Replace white space with underscore in XML elements displayed from admin
socket commands. <config get>...</config get> becomes
<config_get>...</config_get>

http://tracker.ceph.com/issues/10199 Fixes: #10199

Signed-off-by: Loic Dachary <ldachary@redhat.com>
---

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 4816acb334d7..a8633b1520d0 100644
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -14,6 +14,8 @@
 
 #include <time.h>
 
+#include <boost/algorithm/string.hpp>
+
 #include "common/admin_socket.h"
 #include "common/perf_counters.h"
 #include "common/Thread.h"
@@ -191,7 +193,9 @@ void CephContext::do_command(std::string command, cmdmap_t& cmdmap,
     _perf_counters_collection->dump_formatted(f, true);
   }
   else {
-    f->open_object_section(command.c_str());
+    string section = command;
+    boost::replace_all(section, " ", "_");
+    f->open_object_section(section.c_str());
     if (command == "config show") {
       _conf->show_config(f);
     }
diff --git a/src/test/common/test_context.cc b/src/test/common/test_context.cc
index ca745c9a89bd..cb513051af84 100644
--- a/src/test/common/test_context.cc
+++ b/src/test/common/test_context.cc
@@ -39,7 +39,7 @@ TEST(CephContext, do_command)
     bufferlist out;
     cct->do_command("config get", cmdmap, "xml", &out);
     string s(out.c_str(), out.length());
-    EXPECT_EQ("<config get><key>" + value + "</key></config get>", s);
+    EXPECT_EQ("<config_get><key>" + value + "</key></config_get>", s);
   }
 
   {