erasure-code: consistent argument parsing for profiles

Remove the = from the goodchars of the erasure_code_profile argument of
osd pool create so that it is consistent with the goodchars of osd
erasure-code-profile set / rm.

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

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 64e260d61739798a43dba91ece2a3fa957204f89..b11e8524edd581d8513be33054882ec057849813 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -542,8 +542,8 @@ COMMAND("osd pool create " \
        "name=pg_num,type=CephInt,range=0 " \
        "name=pgp_num,type=CephInt,range=0,req=false " \
         "name=pool_type,type=CephChoices,strings=replicated|erasure,req=false " \
-       "name=erasure_code_profile,type=CephString,req=false,goodchars=[A-Za-z0-9-_.=] " \
-       "name=ruleset,type=CephString,req=false,goodchars=[A-Za-z0-9-_.=]", \
+       "name=erasure_code_profile,type=CephString,req=false,goodchars=[A-Za-z0-9-_.] " \
+       "name=ruleset,type=CephString,req=false", \
        "create pool", "osd", "rw", "cli,rest")
 COMMAND("osd pool delete " \
        "name=pool,type=CephPoolname " \

diff --git a/src/test/pybind/test_ceph_argparse.py b/src/test/pybind/test_ceph_argparse.py
index e5408ef1896666f33cc2e62f58f913cffc8f65a0..ddf040972c03763967e076817e9d8c3936c6d763 100755 (executable)
--- a/src/test/pybind/test_ceph_argparse.py
+++ b/src/test/pybind/test_ceph_argparse.py
@@ -947,7 +947,7 @@ class TestOSD(TestArgparse):
                                    'replicated'])
         self.assert_valid_command(['osd', 'pool', 'create',
                                    'poolname', '128', '128',
-                                   'erasure', 'profile', 'ruleset'])
+                                   'erasure', 'A-Za-z0-9-_.', 'ruleset^^'])
         assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create']))
         assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create',
                                                     'poolname']))
@@ -956,12 +956,14 @@ class TestOSD(TestArgparse):
         assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create',
                                                     'poolname',
                                                     '128', '128',
-                                                    'erasure', '^^^']))
+                                                    'erasure', '^^^', 
+                                                                                                       'ruleset']))
         assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create',
                                                     'poolname',
                                                     '128', '128',
                                                     'erasure', 'profile',
-                                                    '^^^']))
+                                                    'ruleset',
+                                                                                                   'toomany']))
         assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create',
                                                     'poolname',
                                                     '128', '128',