From 6bf8183fd19b1da7e25ef123d7a7792d2f54c1c8 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Wed, 11 Jun 2014 22:50:43 +0200 Subject: [PATCH] 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 --- src/mon/MonCommands.h | 4 ++-- src/test/pybind/test_ceph_argparse.py | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 64e260d617397..b11e8524edd58 100644 --- 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 e5408ef189666..ddf040972c037 100755 --- 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', -- 2.39.5