mon: add missing format argument to crush rule dump

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 4ae59858c10d7ba5ce73abeda80774c56edd7bba..176b17772601f5a84ad9ad1e1618e7f498ed06ca 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -363,8 +363,11 @@ 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 rule dump", "dump 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 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 e2fbda8f0993fedd1a301587011e59bdf8fb97c9..e10d1aa2baefe39fdac80a3175f0c4f3ee98f3f7 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -568,12 +568,21 @@ class TestOSD(TestArgparse):
     def test_crush_rule(self):
         assert_equal({}, validate_command(sigdict, ['osd', 'crush']))
         assert_equal({}, validate_command(sigdict, ['osd', 'crush', 'rule']))
-        for subcommand in ('list', 'ls', 'dump'):
+        for subcommand in ('list', 'ls'):
             self.assert_valid_command(['osd', 'crush', 'rule', subcommand])
             assert_equal({}, validate_command(sigdict, ['osd', 'crush',
                                                         'rule', subcommand,
                                                         'toomany']))
 
+    def test_crush_rule_dump(self):
+        self.assert_valid_command(['osd', 'crush', 'rule', 'dump'])
+        for format in ('json', 'json-pretty', 'xml', 'xml-pretty'):
+            self.assert_valid_command(['osd', 'crush', 'rule', 'dump', format])
+        assert_equal({}, validate_command(sigdict, ['osd', 'crush',
+                                                    'rule', 'dump',
+                                                    'json',
+                                                    'toomany']))
+
     def test_crush_dump(self):
         self.assert_valid_command(['osd', 'crush', 'dump'])
         assert_equal({}, validate_command(sigdict, ['osd', 'crush']))