From: Loic Dachary <loic@dachary.org>
Date: Sun, 9 Feb 2014 19:31:44 +0000 (+0100)
Subject: mon: add missing format argument to crush dump
X-Git-Tag: v0.78~184^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fce4d6840448053b685ca3407b2a2680109d6df2;p=ceph.git

mon: add missing format argument to crush dump

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 176b17772601..60fa9815524e 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -363,11 +363,14 @@ COMMAND("osd lspools " \
 COMMAND("osd blacklist ls", "show blacklisted clients", "osd", "r", "cli,rest")
 COMMAND("osd crush rule list", "list crush rules", "osd", "r", "cli,rest")
 COMMAND("osd crush rule ls", "list crush rules", "osd", "r", "cli,rest")
-COMMAND("osd crush dump", "dump crush map", "osd", "r", "cli,rest")
 COMMAND("osd crush rule dump " \
 	"name=format,type=CephChoices,strings=json|json-pretty|xml|xml-pretty,req=false", \
 	"dump crush rules formatted as <format> (default json-pretty)", \
 	"osd", "r", "cli,rest")
+COMMAND("osd crush dump " \
+	"name=format,type=CephChoices,strings=json|json-pretty|xml|xml-pretty,req=false", \
+	"dump crush map formatted as <format> (default json-pretty)", \
+	"osd", "r", "cli,rest")
 COMMAND("osd setcrushmap", "set crush map from input file", \
 	"osd", "rw", "cli,rest")
 COMMAND("osd crush set", "set crush map from input file", \
diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index e10d1aa2baef..822a430ee389 100755
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -585,9 +585,12 @@ class TestOSD(TestArgparse):
 
     def test_crush_dump(self):
         self.assert_valid_command(['osd', 'crush', 'dump'])
+        for format in ('json', 'json-pretty', 'xml', 'xml-pretty'):
+			self.assert_valid_command(['osd', 'crush', 'dump', format])
         assert_equal({}, validate_command(sigdict, ['osd', 'crush']))
         assert_equal({}, validate_command(sigdict, ['osd', 'crush',
-                                                    'dump', 'toomany']))
+                                                    'dump', 'json',
+                                                    'toomany']))
 
     def test_setcrushmap(self):
         self.check_no_arg('osd', 'setcrushmap')