openstack
/
charm-ceph
Code Issues Proposed changes

Patching up the other unit tests to passing status

This commit is contained in:
Chris Holcombe 2016-01-22 15:04:27 -08:00
parent 66d6952a65
commit 477cdc96fb
2 changed files with 94 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/ceph_broker.py
View File

@ -179,7 +179,10 @@ def handle_replicated_pool(request, service):
log(msg, level=ERROR) log(msg, level=ERROR)
return {'exit-code': 1, 'stderr': msg} return {'exit-code': 1, 'stderr': msg}
pool = ReplicatedPool(service=service, name=pool_name, replicas=replicas,pg_num=pg_num) pool = ReplicatedPool(service=service,
name=pool_name,
replicas=replicas,
pg_num=pg_num)
if not pool_exists(service=service, name=pool_name): if not pool_exists(service=service, name=pool_name):
log("Creating pool '%s' (replicas=%s)" % (pool, replicas), log("Creating pool '%s' (replicas=%s)" % (pool, replicas),
level=INFO) level=INFO)

184
unit_tests/test_ceph_broker.py
View File

@ -43,101 +43,97 @@ class CephBrokerTestCase(unittest.TestCase):
{'exit-code': 1, {'exit-code': 1,
'stderr': "Unknown operation 'invalid_op'"}) 'stderr': "Unknown operation 'invalid_op'"})
@mock.patch('ceph_broker.get_osds')
@mock.patch('ceph_broker.ReplicatedPool')
@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_replicated_pool,
mock_get_osds):
mock_get_osds.return_value = [0, 1, 2]
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_replicated_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') @mock.patch('ceph_broker.get_osds')
@mock.patch('ceph_broker.pool_exists') @mock.patch('ceph_broker.ReplicatedPool')
@mock.patch('ceph_broker.log') @mock.patch('ceph_broker.pool_exists')
def test_process_requests_create_pool_exists(self, mock_log, @mock.patch('ceph_broker.log')
mock_pool_exists, def test_process_requests_create_pool_w_pg_num_capped(self, mock_log,
mock_create_pool): mock_pool_exists,
mock_pool_exists.return_value = True mock_replicated_pool,
reqs = json.dumps({'api-version': 1, mock_get_osds):
'ops': [{'op': 'create-pool', 'name': 'foo', mock_get_osds.return_value = [0, 1, 2]
'replicas': 3}]}) mock_pool_exists.return_value = False
rc = ceph_broker.process_requests(reqs) reqs = json.dumps({'api-version': 1,
mock_pool_exists.assert_called_with(service='admin', name='foo') 'ops': [{
self.assertFalse(mock_create_pool.called) 'op': 'create-pool',
self.assertEqual(json.loads(rc), {'exit-code': 0}) 'name': 'foo',
'replicas': 3,
'pg_num': 300}]})
rc = ceph_broker.process_requests(reqs)
mock_pool_exists.assert_called_with(service='admin',
name='foo')
mock_replicated_pool.assert_called_with(service='admin', name='foo',
replicas=3, pg_num=100)
self.assertEqual(json.loads(rc), {'exit-code': 0})
self.assertEqual(json.loads(rc), {'exit-code': 0})
@mock.patch('ceph_broker.ReplicatedPool')
@mock.patch('ceph_broker.pool_exists')
@mock.patch('ceph_broker.log')
def test_process_requests_create_pool_exists(self, mock_log,
mock_pool_exists,
mock_replicated_pool):
mock_pool_exists.return_value = True
reqs = json.dumps({'api-version': 1,
'ops': [{'op': 'create-pool',
'name': 'foo',
'replicas': 3}]})
rc = ceph_broker.process_requests(reqs)
mock_pool_exists.assert_called_with(service='admin',
name='foo')
self.assertFalse(mock_replicated_pool.create.called)
self.assertEqual(json.loads(rc), {'exit-code': 0})
@mock.patch('ceph_broker.get_osds') @mock.patch('ceph_broker.ReplicatedPool')
@mock.patch('ceph_broker.create_pool') @mock.patch('ceph_broker.pool_exists')
@mock.patch('ceph_broker.pool_exists') @mock.patch('ceph_broker.log')
@mock.patch('ceph_broker.log') def test_process_requests_create_pool_rid(self, mock_log,
def test_process_requests_create_pool_w_pg_num(self, mock_log, mock_pool_exists,
mock_pool_exists, mock_replicated_pool):
mock_create_pool, mock_pool_exists.return_value = False
mock_get_osds): reqs = json.dumps({'api-version': 1,
mock_get_osds.return_value = [0, 1, 2] 'request-id': '1ef5aede',
mock_pool_exists.return_value = False 'ops': [{
reqs = json.dumps({'api-version': 1, 'op': 'create-pool',
'ops': [{'op': 'create-pool', 'name': 'name': 'foo',
'foo', 'replicas': 3, 'replicas': 3}]})
'pg_num': 100}]}) rc = ceph_broker.process_requests(reqs)
rc = ceph_broker.process_requests(reqs) mock_pool_exists.assert_called_with(service='admin', name='foo')
mock_pool_exists.assert_called_with(service='admin', name='foo') mock_replicated_pool.assert_called_with(service='admin',
mock_create_pool.assert_called_with(service='admin', name='foo', name='foo',
replicas=3, pg_num='100') pg_num=None,
self.assertEqual(json.loads(rc), {'exit-code': 0}) replicas=3)
self.assertEqual(json.loads(rc)['exit-code'], 0)
self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')
@mock.patch('ceph_broker.get_osds') @mock.patch('ceph_broker.log')
@mock.patch('ceph_broker.create_pool') def test_process_requests_invalid_api_rid(self, mock_log):
@mock.patch('ceph_broker.pool_exists') reqs = json.dumps({'api-version': 0, 'request-id': '1ef5aede',
@mock.patch('ceph_broker.log') 'ops': [{'op': 'create-pool'}]})
def test_process_requests_create_pool_w_pg_num_capped(self, mock_log, rc = ceph_broker.process_requests(reqs)
mock_pool_exists, self.assertEqual(json.loads(rc)['exit-code'], 1)
mock_create_pool, self.assertEqual(json.loads(rc)['stderr'],
mock_get_osds): "Missing or invalid api version (0)")
mock_get_osds.return_value = [0, 1, 2] self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')
mock_pool_exists.return_value = False
reqs = json.dumps({'api-version': 1,
'ops': [{'op': 'create-pool', 'name':
'foo', 'replicas': 3,
'pg_num': 300}]})
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')
@mock.patch('ceph_broker.pool_exists')
@mock.patch('ceph_broker.log')
def test_process_requests_create_pool_exists(self, mock_log,
mock_pool_exists,
mock_create_pool):
mock_pool_exists.return_value = True
reqs = json.dumps({'api-version': 1,
'ops': [{'op': 'create-pool', 'name': 'foo',
'replicas': 3}]})
rc = ceph_broker.process_requests(reqs)
mock_pool_exists.assert_called_with(service='admin', name='foo')
self.assertFalse(mock_create_pool.called)
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_rid(self, mock_log, mock_pool_exists,
mock_create_pool):
mock_pool_exists.return_value = False
reqs = json.dumps({'api-version': 1,
'request-id': '1ef5aede',
'ops': [{'op': 'create-pool', 'name':
'foo', 'replicas': 3}]})
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=None)
self.assertEqual(json.loads(rc)['exit-code'], 0)
self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')
@mock.patch('ceph_broker.log')
def test_process_requests_invalid_api_rid(self, mock_log):
reqs = json.dumps({'api-version': 0, 'request-id': '1ef5aede',
'ops': [{'op': 'create-pool'}]})
rc = ceph_broker.process_requests(reqs)
self.assertEqual(json.loads(rc)['exit-code'], 1)
self.assertEqual(json.loads(rc)['stderr'],
"Missing or invalid api version (0)")
self.assertEqual(json.loads(rc)['request-id'], '1ef5aede')