openstack
/
charm-glance
Code Issues Proposed changes

[ddellav,r=corey.bryant] Action managed upgrade support.

This commit is contained in:
Corey Bryant 2015-10-08 20:17:57 -04:00
parent 2276c7468c f346f35827
commit ea3a08efb4
2 changed files with 36 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
actions/openstack_upgrade.py
View File

@ -1,29 +1,15 @@
#!/usr/bin/python
import traceback
from charmhelpers.core.hookenv import (
action_set,
action_fail,
config
)
from hooks.glance_relations import config_changed
from charmhelpers.contrib.openstack.utils import (
juju_log,
git_install_requested,
openstack_upgrade_available
do_action_openstack_upgrade,
)
from hooks.glance_utils import (
do_openstack_upgrade,
register_configs
from hooks.glance_relations import (
config_changed,
CONFIGS
)
CONFIGS = register_configs()
from hooks.glance_utils import do_openstack_upgrade
def openstack_upgrade():
@ -33,29 +19,10 @@ def openstack_upgrade():
For backwards compatibility a config flag must be set for this
code to run, otherwise a full service level upgrade will fire
on config-changed."""
if git_install_requested():
action_set({'outcome': 'installed from source, skipped upgrade.'})
else:
if openstack_upgrade_available('glance-common'):
if config('action-managed-upgrade'):
juju_log('Upgrading OpenStack release')
try:
do_openstack_upgrade(CONFIGS)
action_set({'outcome': 'success, upgrade completed.'})
except:
action_set({'outcome': 'upgrade failed, see traceback.'})
action_set({'traceback': traceback.format_exc()})
action_fail('do_openstack_upgrade resulted in an '
'unexpected error')
config_changed()
else:
action_set({'outcome': 'action-managed-upgrade config is '
'False, skipped upgrade.'})
else:
action_set({'outcome': 'no upgrade available.'})
if (do_action_openstack_upgrade('glance-common',
do_openstack_upgrade,
CONFIGS)):
config_changed()
if __name__ == '__main__':
openstack_upgrade()

113
unit_tests/test_actions_openstack_upgrade.py
View File

@ -5,15 +5,15 @@ os.environ['JUJU_UNIT_NAME'] = 'glance'
with patch('actions.hooks.glance_utils.register_configs'):
with patch('hooks.glance_utils.register_configs'):
from actions import openstack_upgrade
from actions import openstack_upgrade
from test_utils import (
CharmTestCase
)
TO_PATCH = [
'config',
'git_install_requested',
'config_changed',
'do_openstack_upgrade'
]
@ -22,98 +22,39 @@ class TestGlanceUpgradeActions(CharmTestCase):
def setUp(self):
super(TestGlanceUpgradeActions, self).setUp(openstack_upgrade,
TO_PATCH)
self.config.side_effect = self.test_config.get
self.git_install_requested.return_value = False
@patch.object(openstack_upgrade, 'action_set')
@patch.object(openstack_upgrade, 'action_fail')
@patch.object(openstack_upgrade, 'do_openstack_upgrade')
@patch.object(openstack_upgrade, 'openstack_upgrade_available')
@patch.object(openstack_upgrade, 'config_changed')
@patch('actions.charmhelpers.contrib.openstack.utils.config')
@patch('actions.charmhelpers.contrib.openstack.utils.action_set')
@patch('actions.charmhelpers.contrib.openstack.utils.git_install_requested') # noqa
@patch('actions.charmhelpers.contrib.openstack.utils.openstack_upgrade_available') # noqa
@patch('actions.charmhelpers.contrib.openstack.utils.juju_log')
@patch('subprocess.check_output')
def test_openstack_upgrade(self, _check_output, config_changed,
openstack_upgrade_available,
do_openstack_upgrade, action_fail,
action_set):
def test_openstack_upgrade_true(self, _check_output, log, upgrade_avail,
git_requested, action_set, config):
_check_output.return_value = 'null'
openstack_upgrade_available.return_value = True
self.test_config.set('action-managed-upgrade', True)
git_requested.return_value = False
upgrade_avail.return_value = True
config.return_value = True
openstack_upgrade.openstack_upgrade()
self.assertTrue(do_openstack_upgrade.called)
self.assertTrue(config_changed.called)
self.assertFalse(action_fail.called)
self.assertTrue(self.do_openstack_upgrade.called)
self.assertTrue(self.config_changed.called)
@patch.object(openstack_upgrade, 'action_set')
@patch.object(openstack_upgrade, 'do_openstack_upgrade')
@patch.object(openstack_upgrade, 'openstack_upgrade_available')
@patch.object(openstack_upgrade, 'config_changed')
@patch('actions.charmhelpers.contrib.openstack.utils.config')
@patch('actions.charmhelpers.contrib.openstack.utils.action_set')
@patch('actions.charmhelpers.contrib.openstack.utils.git_install_requested') # noqa
@patch('actions.charmhelpers.contrib.openstack.utils.openstack_upgrade_available') # noqa
@patch('actions.charmhelpers.contrib.openstack.utils.juju_log')
@patch('subprocess.check_output')
def test_openstack_upgrade_not_configured(self, _check_output,
config_changed,
openstack_upgrade_available,
do_openstack_upgrade,
action_set):
def test_openstack_upgrade_false(self, _check_output, log, upgrade_avail,
git_requested, action_set, config):
_check_output.return_value = 'null'
openstack_upgrade_available.return_value = True
git_requested.return_value = False
upgrade_avail.return_value = True
config.return_value = False
openstack_upgrade.openstack_upgrade()
msg = ('action-managed-upgrade config is False, skipped upgrade.')
action_set.assert_called_with({'outcome': msg})
self.assertFalse(do_openstack_upgrade.called)
@patch.object(openstack_upgrade, 'action_set')
@patch.object(openstack_upgrade, 'do_openstack_upgrade')
@patch.object(openstack_upgrade, 'openstack_upgrade_available')
@patch.object(openstack_upgrade, 'config_changed')
@patch.object(openstack_upgrade, 'git_install_requested')
def test_openstack_upgrade_git_install(self, git_install_requested,
config_changed,
openstack_upgrade_available,
do_openstack_upgrade, action_set):
git_install_requested.return_value = True
openstack_upgrade.openstack_upgrade()
msg = ('installed from source, skipped upgrade.')
action_set.assert_called_with({'outcome': msg})
self.assertFalse(do_openstack_upgrade.called)
@patch.object(openstack_upgrade, 'action_set')
@patch.object(openstack_upgrade, 'action_fail')
@patch.object(openstack_upgrade, 'do_openstack_upgrade')
@patch.object(openstack_upgrade, 'openstack_upgrade_available')
@patch.object(openstack_upgrade, 'config_changed')
@patch('traceback.format_exc')
@patch('charmhelpers.core.hookenv.config')
def test_openstack_upgrade_exception(self, _config, format_exc,
config_changed,
openstack_upgrade_available,
do_openstack_upgrade,
action_fail, action_set):
_config.return_value = None
self.test_config.set('action-managed-upgrade', True)
openstack_upgrade_available.return_value = True
e = OSError('something bad happened')
do_openstack_upgrade.side_effect = e
traceback = (
"Traceback (most recent call last):\n"
" File \"actions/openstack_upgrade.py\", line 37, in openstack_upgrade\n" # noqa
" openstack_upgrade(config(\'openstack-origin-git\'))\n"
" File \"/usr/lib/python2.7/dist-packages/mock.py\", line 964, in __call__\n" # noqa
" return _mock_self._mock_call(*args, **kwargs)\n"
" File \"/usr/lib/python2.7/dist-packages/mock.py\", line 1019, in _mock_call\n" # noqa
" raise effect\n"
"OSError: something bad happened\n")
format_exc.return_value = traceback
openstack_upgrade.openstack_upgrade()
msg = 'do_openstack_upgrade resulted in an unexpected error'
action_fail.assert_called_with(msg)
action_set.assert_called_with({'traceback': traceback})
self.assertFalse(self.do_openstack_upgrade.called)
self.assertFalse(self.config_changed.called)