mon:make 'ceph osd map' accept namespace.

For OSDMonitor::preprocess_command, it already can handle osd map w/
namespace. But the cli leak this.So fix this.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

diff --git a/src/mon/DumplingMonCommands.h b/src/mon/DumplingMonCommands.h
index 8e9c2bb333b374a0153a34588c91c270230aaae5..7cce6abd8cd25a60d44edb861745f8a860a47090 100644 (file)
--- a/src/mon/DumplingMonCommands.h
+++ b/src/mon/DumplingMonCommands.h
@@ -332,8 +332,9 @@ COMMAND("osd find " \
        "osd", "r", "cli,rest")
 COMMAND("osd map " \
        "name=pool,type=CephPoolname " \
-       "name=object,type=CephObjectname", \
-       "find pg for <object> in <pool>", "osd", "r", "cli,rest")
+       "name=object,type=CephObjectname " \
+       "name=nspace,type=CephString,req=false", \
+       "find pg for <object> in <pool> with [namespace]", "osd", "r", "cli,rest")
 COMMAND("osd scrub " \
        "name=who,type=CephString", \
        "initiate scrub on osd <who>", "osd", "rw", "cli,rest")

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 3c5a0bc5eca344acdb841b3be90e427b4067acdf..cdb6b68d8ce5f2c96ab7c84fa96a01a52ee5d028 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -398,8 +398,9 @@ COMMAND("osd metadata " \
        "osd", "r", "cli,rest")
 COMMAND("osd map " \
        "name=pool,type=CephPoolname " \
-       "name=object,type=CephObjectname", \
-       "find pg for <object> in <pool>", "osd", "r", "cli,rest")
+       "name=object,type=CephObjectname " \
+       "name=nspace,type=CephString,req=false", \
+       "find pg for <object> in <pool> with [namespace]", "osd", "r", "cli,rest")
 COMMAND("osd scrub " \
        "name=who,type=CephString", \
        "initiate scrub on osd <who>", "osd", "rw", "cli,rest")

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index eb79323c0ff836752b3305b7d38568bae4c446d0..2be33951d61c90c394d031175aafbd4fd1f6dd54 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -548,10 +548,11 @@ class TestOSD(TestArgparse):
 
     def test_map(self):
         self.assert_valid_command(['osd', 'map', 'poolname', 'objectname'])
+        self.assert_valid_command(['osd', 'map', 'poolname', 'objectname', 'nspace'])
         assert_equal({}, validate_command(sigdict, ['osd', 'map']))
         assert_equal({}, validate_command(sigdict, ['osd', 'map', 'poolname']))
         assert_equal({}, validate_command(sigdict, ['osd', 'map',
-                                                    'poolname', 'objectname',
+                                                    'poolname', 'objectname', 'nspace',
                                                     'toomany']))
 
     def test_metadata(self):