RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 01:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #983 from dachary/wip-rep-replicated

Browse Source 
mon: s/rep/replicated/ in pool create prototype

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-12-22 12:39:08 -08:00
commit 880a7dcb26
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/MonCommands.h
View File

@ -496,7 +496,7 @@ COMMAND("osd pool create " \
"name=pool,type=CephPoolname " \
"name=pg_num,type=CephInt,range=0 " \
"name=pgp_num,type=CephInt,range=0,req=false " \
"name=pool_type,type=CephChoices,strings=rep|erasure,req=false " \
"name=pool_type,type=CephChoices,strings=replicated|erasure,req=false " \
"name=properties,type=CephString,n=N,req=false,goodchars=[A-Za-z0-9-_.=]", \
"create pool", "osd", "rw", "cli,rest")
COMMAND("osd pool delete " \

25
src/test/pybind/test_ceph_argparse.py
View File

@ -886,30 +886,7 @@ class TestOSD(TestArgparse):
'poolname', '128', '128'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'foo=bar'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'foo=bar', 'baz=frob'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128',
'foo=bar', 'baz=frob'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'rep'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'raid4'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'erasure'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'rep',
'foo=bar'])
self.assert_valid_command(['osd', 'pool', 'create',
'poolname', '128', '128',
'rep',
'foo=bar', 'bar=baz'])
'whatever'])
assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create']))
assert_equal({}, validate_command(sigdict, ['osd', 'pool', 'create',
'poolname']))