openstack/charm-cinder-backup
Code Issues Proposed changes

Request appropriate Ceph application name for pools created

Browse Source 
Change-Id: I33107f4266f481cf79bc8fe9d29428185b52e4c8
This commit is contained in:
Frode Nordahl 2019-03-13 16:02:50 +01:00
parent adfd600034
commit abefc9a358
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/cinder_backup_hooks.py
View File

@ -81,7 +81,7 @@ def get_ceph_request():
service = service_name() service = service_name()
rq = CephBrokerRq() rq = CephBrokerRq()
replicas = config('ceph-osd-replication-count') replicas = config('ceph-osd-replication-count')
rq.add_op_create_pool(name=service, replica_count=replicas) rq.add_op_create_pool(name=service, replica_count=replicas, app_name='rbd')
return rq return rq

34
unit_tests/test_cinder_backup_hooks.py
View File

@ -12,9 +12,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from mock import patch import mock
with patch('cinder_backup_utils.register_configs'): with mock.patch('cinder_backup_utils.register_configs'):
import cinder_backup_hooks as hooks import cinder_backup_hooks as hooks
from test_utils import ( from test_utils import (
@ -52,16 +52,16 @@ class TestCinderBackupHooks(CharmTestCase):
super(TestCinderBackupHooks, self).setUp(hooks, TO_PATCH) super(TestCinderBackupHooks, self).setUp(hooks, TO_PATCH)
self.config.side_effect = self.test_config.get self.config.side_effect = self.test_config.get
@patch('charmhelpers.core.hookenv.config') @mock.patch('charmhelpers.core.hookenv.config')
@patch('os.mkdir') @mock.patch('os.mkdir')
def test_ceph_joined(self, mkdir, mock_config): def test_ceph_joined(self, mkdir, mock_config):
"""It correctly prepares for a ceph changed hook""" """It correctly prepares for a ceph changed hook"""
with patch('os.path.isdir') as isdir: with mock.patch('os.path.isdir') as isdir:
isdir.return_value = False isdir.return_value = False
hooks.hooks.execute(['hooks/ceph-relation-joined']) hooks.hooks.execute(['hooks/ceph-relation-joined'])
mkdir.assert_called_with('/etc/ceph') mkdir.assert_called_with('/etc/ceph')
@patch('charmhelpers.core.hookenv.config') @mock.patch('charmhelpers.core.hookenv.config')
def test_ceph_changed_no_key(self, mock_config): def test_ceph_changed_no_key(self, mock_config):
"""It does nothing when ceph key is not available""" """It does nothing when ceph key is not available"""
self.CONFIGS.complete_contexts.return_value = [''] self.CONFIGS.complete_contexts.return_value = ['']
@ -69,7 +69,7 @@ class TestCinderBackupHooks(CharmTestCase):
m = 'ceph relation incomplete. Peer not ready?' m = 'ceph relation incomplete. Peer not ready?'
self.log.assert_called_with(m) self.log.assert_called_with(m)
@patch('charmhelpers.core.hookenv.config') @mock.patch('charmhelpers.core.hookenv.config')
def test_ceph_changed(self, mock_config): def test_ceph_changed(self, mock_config):
"""It ensures ceph assets created on ceph changed""" """It ensures ceph assets created on ceph changed"""
self.is_request_complete.return_value = True self.is_request_complete.return_value = True
@ -83,8 +83,8 @@ class TestCinderBackupHooks(CharmTestCase):
self.assertTrue(self.CONFIGS.write_all.called) self.assertTrue(self.CONFIGS.write_all.called)
self.set_ceph_env_variables.assert_called_with(service='cinder-backup') self.set_ceph_env_variables.assert_called_with(service='cinder-backup')
@patch.object(hooks, 'get_ceph_request') @mock.patch.object(hooks, 'get_ceph_request')
@patch('charmhelpers.core.hookenv.config') @mock.patch('charmhelpers.core.hookenv.config')
def test_ceph_changed_newrq(self, mock_config, mock_get_ceph_request): def test_ceph_changed_newrq(self, mock_config, mock_get_ceph_request):
"""It ensures ceph assets created on ceph changed""" """It ensures ceph assets created on ceph changed"""
mock_get_ceph_request.return_value = 'cephreq' mock_get_ceph_request.return_value = 'cephreq'
@ -98,7 +98,7 @@ class TestCinderBackupHooks(CharmTestCase):
group='cinder') group='cinder')
self.send_request_if_needed.assert_called_with('cephreq') self.send_request_if_needed.assert_called_with('cephreq')
@patch('charmhelpers.core.hookenv.config') @mock.patch('charmhelpers.core.hookenv.config')
def test_ceph_changed_no_keys(self, mock_config): def test_ceph_changed_no_keys(self, mock_config):
"""It ensures ceph assets created on ceph changed""" """It ensures ceph assets created on ceph changed"""
self.CONFIGS.complete_contexts.return_value = ['ceph'] self.CONFIGS.complete_contexts.return_value = ['ceph']
@ -110,3 +110,17 @@ class TestCinderBackupHooks(CharmTestCase):
# the hook should just exit 0 and return. # the hook should just exit 0 and return.
self.assertTrue(self.log.called) self.assertTrue(self.log.called)
self.assertFalse(self.CONFIGS.write_all.called) self.assertFalse(self.CONFIGS.write_all.called)
@mock.patch.object(hooks, 'CephBrokerRq')
@mock.patch.object(hooks, 'config')
@mock.patch.object(hooks, 'service_name')
def test_ceph_request(self, _service_name, _config, _ceph_broker_rq):
_service_name.return_value = 'cinder-backup'
_config.return_value = None
rq = mock.MagicMock()
_ceph_broker_rq.return_value = rq
self.assertEqual(hooks.get_ceph_request(), rq)
_service_name.assert_called_once_with()
_config.assert_called_once_with('ceph-osd-replication-count')
rq.add_op_create_pool.assert_called_once_with(
name='cinder-backup', replica_count=_config(), app_name='rbd')