openstack
/
charm-cinder
Code Issues Proposed changes

Part 2 of upgrades fix in commit c1653c2 

In the first patch I forgot to ensure that we also
reload the configs that are globally declared in
cinder_hooks and therefore loaded on import. So here
it is.

Change-Id: I613959fa91912b388aea8bd6926d085956c1d67e
Closes-Bug: #1726527
This commit is contained in:
Edward Hope-Morley 2017-10-24 17:19:31 +01:00
parent c1653c2113
commit 5a5e542f9a
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
actions/openstack_upgrade.py
View File

@ -28,12 +28,11 @@ from charmhelpers.core.hookenv import (
relation_set,
)
from cinder_hooks import (
config_changed,
)
import cinder_hooks
from cinder_utils import (
do_openstack_upgrade,
register_configs,
)
@ -52,7 +51,11 @@ def openstack_upgrade():
for rid in relation_ids('storage-backend'):
relation_set(relation_id=rid,
upgrade_nonce=uuid.uuid4())
config_changed()
# Force reload to get any chances resulting from upgrade.
# See LP 1726527.
cinder_hooks.CONFIGS = register_configs()
cinder_hooks.config_changed()
if __name__ == '__main__':
openstack_upgrade()

17
unit_tests/test_actions_openstack_upgrade.py
View File

@ -14,7 +14,7 @@
import os
from mock import patch
from mock import patch, MagicMock
from test_utils import (
CharmTestCase,
@ -28,7 +28,6 @@ with patch('cinder_utils.register_configs') as register_configs:
import openstack_upgrade
TO_PATCH = [
'config_changed',
'do_openstack_upgrade',
'relation_set',
'relation_ids',
@ -42,13 +41,16 @@ class TestCinderUpgradeActions(CharmTestCase):
super(TestCinderUpgradeActions, self).setUp(openstack_upgrade,
TO_PATCH)
@patch.object(openstack_upgrade, 'cinder_hooks')
@patch('charmhelpers.contrib.openstack.utils.juju_log')
@patch('charmhelpers.contrib.openstack.utils.config')
@patch('charmhelpers.contrib.openstack.utils.action_set')
@patch('charmhelpers.contrib.openstack.utils.git_install_requested')
@patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
def test_openstack_upgrade_true(self, upgrade_avail, git_requested,
action_set, config, log):
action_set, config, log,
mock_cinder_hooks):
mock_cinder_hooks.config_changed = MagicMock()
git_requested.return_value = False
upgrade_avail.return_value = True
config.return_value = True
@ -61,15 +63,18 @@ class TestCinderUpgradeActions(CharmTestCase):
self.assertTrue(self.relation_ids.called)
self.relation_set.assert_called_with(relation_id='relid1',
upgrade_nonce=12345)
self.assertTrue(self.config_changed.called)
self.assertTrue(mock_cinder_hooks.config_changed.called)
@patch.object(openstack_upgrade, 'cinder_hooks')
@patch('charmhelpers.contrib.openstack.utils.juju_log')
@patch('charmhelpers.contrib.openstack.utils.config')
@patch('charmhelpers.contrib.openstack.utils.action_set')
@patch('charmhelpers.contrib.openstack.utils.git_install_requested')
@patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
def test_openstack_upgrade_false(self, upgrade_avail, git_requested,
action_set, config, log):
action_set, config, log,
mock_cinder_hooks):
mock_cinder_hooks.config_changed = MagicMock()
git_requested.return_value = False
upgrade_avail.return_value = True
config.return_value = False
@ -79,4 +84,4 @@ class TestCinderUpgradeActions(CharmTestCase):
self.assertFalse(self.do_openstack_upgrade.called)
self.assertFalse(self.relation_ids.called)
self.assertFalse(self.relation_set.called)
self.assertFalse(self.config_changed.called)
self.assertFalse(mock_cinder_hooks.config_changed.called)