openstack
/
charm-ceph
Code Issues Proposed changes

add pool create pg_num override support

This commit is contained in:
Edward Hope-Morley 2015-11-19 17:58:38 +00:00
parent fb2714a1d1
commit 562bde334a
2 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hooks/ceph_broker.py
View File

@ -83,12 +83,21 @@ def process_requests_v1(reqs):
log(msg, level=ERROR)
return {'exit-code': 1, 'stderr': msg}
# Mandatory params
pool = params['pool']
replicas = params['replicas']
# Optional params
pg_num = req.get('pg_num')
if pg_num:
# Ensure string
pg_num = str(pg_num)
if not pool_exists(service=svc, name=pool):
log("Creating pool '%s' (replicas=%s)" % (pool, replicas),
level=INFO)
create_pool(service=svc, name=pool, replicas=replicas)
create_pool(service=svc, name=pool, replicas=replicas,
pg_num=pg_num)
else:
log("Pool '%s' already exists - skipping create" % (pool),
level=DEBUG)

21
unit_tests/test_ceph_broker.py
View File

@ -53,7 +53,24 @@ class CephBrokerTestCase(unittest.TestCase):
rc = ceph_broker.process_requests(reqs)
mock_pool_exists.assert_called_with(service='admin', name='foo')
mock_create_pool.assert_called_with(service='admin', name='foo',
replicas=3)
replicas=3, pg_num=None)
self.assertEqual(json.loads(rc), {'exit-code': 0})
@mock.patch('ceph_broker.create_pool')
@mock.patch('ceph_broker.pool_exists')
@mock.patch('ceph_broker.log')
def test_process_requests_create_pool_w_pg_num(self, mock_log,
mock_pool_exists,
mock_create_pool):
mock_pool_exists.return_value = False
reqs = json.dumps({'api-version': 1,
'ops': [{'op': 'create-pool', 'name':
'foo', 'replicas': 3,
'pg_num': 100}]})
rc = ceph_broker.process_requests(reqs)
mock_pool_exists.assert_called_with(service='admin', name='foo')
mock_create_pool.assert_called_with(service='admin', name='foo',
replicas=3, pg_num='100')
self.assertEqual(json.loads(rc), {'exit-code': 0})
@mock.patch('ceph_broker.create_pool')
@ -84,7 +101,7 @@ class CephBrokerTestCase(unittest.TestCase):
rc = ceph_broker.process_requests(reqs)
mock_pool_exists.assert_called_with(service='admin', name='foo')
mock_create_pool.assert_called_with(service='admin', name='foo',
replicas=3)
replicas=3, pg_num=None)
self.assertEqual(json.loads(rc)['exit-code'], 0)
self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')