erasure-code: relax profile parameter syntax

Do not restrict the character set of the key=value pairs of osd
erasure-code-profile set to allow for things like:

             layers='[
                       [ "_aAA_aAA", "" ],
                       [ "bBBB____", "" ],
                       [ "____cCCC", "" ],
                     ]'

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 74741e74186bb699ed01c09441806064c595271b..d7026150bd56ee534c66d37b20f85ad4c1ef39f5 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -479,7 +479,7 @@ COMMAND("osd pause", "pause osd", "osd", "rw", "cli,rest")
 COMMAND("osd unpause", "unpause osd", "osd", "rw", "cli,rest")
 COMMAND("osd erasure-code-profile set " \
        "name=name,type=CephString,goodchars=[A-Za-z0-9-_.] " \
-       "name=profile,type=CephString,n=N,req=false,goodchars=[A-Za-z0-9-_.=]", \
+       "name=profile,type=CephString,n=N,req=false", \
        "create erasure code profile <name> with [<key[=value]> ...] pairs. Add a --force at the end to override an existing profile (VERY DANGEROUS)", \
        "osd", "rw", "cli,rest")
 COMMAND("osd erasure-code-profile get " \

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index 3187290aa9f58685b75ff5482a949cd84d27f54c..7f492ed908357be21f1e59adeb35fe42c6ce39ed 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -805,11 +805,6 @@ class TestOSD(TestArgparse):
                                                     'erasure-code-profile',
                                                     'set',
                                                     '^^^^']))
-        assert_equal({}, validate_command(sigdict, ['osd',
-                                                    'erasure-code-profile',
-                                                    'set',
-                                                    'name',
-                                                    '^^^^']))
 
     def test_erasure_code_profile_get(self):
         self.assert_valid_command(['osd', 'erasure-code-profile', 'get',