Merge lp:~ddellav/charms/trusty/cinder/upgrade-action into lp:~openstack-charmers-archive/charms/trusty/cinder/next

[David Della Vecchia]

Added openstack-upgrade action to cinder charm as well as associated required configs and unit tests.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8760 cinder-next for ddellav mp269247
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8760/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8091 cinder-next for ddellav mp269247
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8091/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6038 cinder-next for ddellav mp269247
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6038/

[Corey Bryant (corey.bryant)]

It looks you may not have bzr added some files?
Also can you update the action-managed-upgrade description to match the one in glance?

[Corey Bryant (corey.bryant)]

review: Needs Fixing

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #8935 cinder-next for ddellav mp269247
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/8935/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8257 cinder-next for ddellav mp269247
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8257/

[Corey Bryant (corey.bryant)]

I have some inline comments below.

Also, can you add a unit test like what you added to unit_tests/test_glance_relations.py? Asserting that the old migration isn't called when new migration is configured.

review: Needs Fixing

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6081 cinder-next for ddellav mp269247
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6081/

[Corey Bryant (corey.bryant)]

Some more comments inline

review: Needs Fixing

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9096 cinder-next for ddellav mp269247
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9096/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8405 cinder-next for ddellav mp269247
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8405/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6154 cinder-next for ddellav mp269247
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6154/

[lp:~ddellav/charms/trusty/cinder/upgrade-action]

122. By David Della Vecchia on 2015-09-01

Adding tests for relation_ids, relation_set. Fixing comment formatting. Hiding juju_log output in tests.

123. By David Della Vecchia on 2015-09-01

merging trunk

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9159 cinder-next for ddellav mp269247
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12246226/
Build: http://10.245.162.77:8080/job/charm_lint_check/9159/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8465 cinder-next for ddellav mp269247
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/12246228/
Build: http://10.245.162.77:8080/job/charm_unit_test/8465/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9161 cinder-next for ddellav mp269247
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12246272/
Build: http://10.245.162.77:8080/job/charm_lint_check/9161/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8467 cinder-next for ddellav mp269247
    UNIT FAIL: unit-test failed

UNIT Results (max last 2 lines):
make: *** [test] Error 1
ERROR:root:Make target returned non-zero.

Full unit test output: http://paste.ubuntu.com/12246275/
Build: http://10.245.162.77:8080/job/charm_unit_test/8467/

[lp:~ddellav/charms/trusty/cinder/upgrade-action]

124. By David Della Vecchia on 2015-09-01

Proper merge of trunk.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9163 cinder-next for ddellav mp269247
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/9163/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #8470 cinder-next for ddellav mp269247
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/8470/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6174 cinder-next for ddellav mp269247
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6174/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6177 cinder-next for ddellav mp269247
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6177/

[Corey Bryant (corey.bryant)]

review: Approve

=== modified file 'actions.yaml'
--- actions.yaml	2015-03-21 02:18:45 +0000
+++ actions.yaml	2015-09-01 16:22:19 +0000
@@ -1,2 +1,4 @@
 git-reinstall:
   description: Reinstall cinder from the openstack-origin-git repositories.
+openstack-upgrade:
+  description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.
 
=== added symlink 'actions/openstack-upgrade'
=== target is u'openstack_upgrade.py'
=== added file 'actions/openstack_upgrade.py'
--- actions/openstack_upgrade.py	1970-01-01 00:00:00 +0000
+++ actions/openstack_upgrade.py	2015-09-01 16:22:19 +0000
@@ -0,0 +1,72 @@
+#!/usr/bin/python
+import sys
+import traceback
+import uuid
+
+sys.path.append('hooks/')
+
+from charmhelpers.core.hookenv import (
+    action_set,
+    action_fail,
+    config,
+    relation_ids,
+    relation_set
+)
+
+from cinder_hooks import config_changed
+
+from charmhelpers.contrib.openstack.utils import (
+    juju_log,
+    git_install_requested,
+    openstack_upgrade_available
+)
+
+from cinder_utils import (
+    do_openstack_upgrade,
+    register_configs
+)
+
+
+CONFIGS = register_configs()
+
+
+def openstack_upgrade():
+    """Upgrade packages to config-set Openstack version.
+
+    If the charm was installed from source we cannot upgrade it.
+    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('cinder-common'):
+            if config('action-managed-upgrade'):
+                juju_log('Upgrading OpenStack release')
+
+                try:
+                    do_openstack_upgrade(configs=CONFIGS)
+
+                    # NOTE(jamespage) tell any storage-backends we just
+                    # upgraded
+                    for rid in relation_ids('storage-backend'):
+                        relation_set(relation_id=rid,
+                                     upgrade_nonce=uuid.uuid4())
+
+                    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 __name__ == '__main__':
+    openstack_upgrade()
 
=== modified file 'config.yaml'
--- config.yaml	2015-08-03 20:18:39 +0000
+++ config.yaml	2015-09-01 16:22:19 +0000
@@ -282,4 +282,13 @@
     description: |
       A comma-separated list of nagios servicegroups.
       If left empty, the nagios_context will be used as the servicegroup
-
+  action-managed-upgrade:
+    type: boolean
+    default: False
+    description: |
+      If True enables openstack upgrades for this charm via juju actions.
+      You will still need to set openstack-origin to the new repository but
+      instead of an upgrade running automatically across all units, it will
+      wait for you to execute the openstack-upgrade action for this charm on
+      each unit. If False it will revert to existing behavior of upgrading
+      all units on config change.
 
=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2015-08-31 20:26:18 +0000
+++ hooks/cinder_hooks.py	2015-09-01 16:22:19 +0000
@@ -141,7 +141,7 @@
     if git_install_requested():
         if config_value_changed('openstack-origin-git'):
             git_install(config('openstack-origin-git'))
-    else:
+    elif not config('action-managed-upgrade'):
         if openstack_upgrade_available('cinder-common'):
             do_openstack_upgrade(configs=CONFIGS)
             # NOTE(jamespage) tell any storage-backends we just upgraded
 
=== added file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-09-01 16:22:19 +0000
@@ -0,0 +1,126 @@
+from mock import patch
+import os
+
+os.environ['JUJU_UNIT_NAME'] = 'cinder'
+
+with patch('cinder_utils.register_configs') as register_configs:
+    import openstack_upgrade
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'config',
+    'juju_log',
+    'relation_set',
+    'relation_ids',
+    'uuid'
+]
+
+
+class TestCinderUpgradeActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestCinderUpgradeActions, self).setUp(openstack_upgrade,
+                                                    TO_PATCH)
+        self.config.side_effect = self.test_config.get
+
+    @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('charmhelpers.contrib.openstack.utils.config')
+    def test_openstack_upgrade(self, _config, config_changed,
+                               openstack_upgrade_available,
+                               do_openstack_upgrade, action_fail,
+                               action_set):
+        _config.return_value = None
+        openstack_upgrade_available.return_value = True
+        self.relation_ids.return_value = ['relid1']
+        self.uuid.uuid4.return_value = 12345
+
+        self.test_config.set('action-managed-upgrade', True)
+
+        openstack_upgrade.openstack_upgrade()
+
+        self.assertTrue(do_openstack_upgrade.called)
+        self.assertTrue(config_changed.called)
+        self.assertTrue(self.relation_ids.called)
+        self.relation_set.assert_called_with(relation_id='relid1',
+                                             upgrade_nonce=12345)
+        self.assertFalse(action_fail.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('charmhelpers.contrib.openstack.utils.config')
+    def test_openstack_upgrade_not_configured(self, _config, config_changed,
+                                              openstack_upgrade_available,
+                                              do_openstack_upgrade,
+                                              action_set):
+        _config.return_value = None
+        openstack_upgrade_available.return_value = True
+
+        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('charmhelpers.contrib.openstack.utils.config')
+    def test_openstack_upgrade_git_install(self, _config, config_changed,
+                                           openstack_upgrade_available,
+                                           do_openstack_upgrade,
+                                           action_set):
+
+        self.test_config.set('action-managed-upgrade', True)
+        self.test_config.set('openstack-origin-git', 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.contrib.openstack.utils.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})
 
=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2015-07-30 07:50:05 +0000
+++ unit_tests/test_cinder_hooks.py	2015-09-01 16:22:19 +0000
@@ -254,6 +254,19 @@
                                                       False, False, False)
         self.service_restart.assert_called_with('cinder-volume')
 
+    @patch.object(hooks, 'git_install_requested')
+    @patch.object(hooks, 'config_value_changed')
+    def test_config_changed_with_openstack_upgrade_action(self,
+                                                          config_value_changed,
+                                                          git_requested):
+        git_requested.return_value = False
+        self.openstack_upgrade_available.return_value = True
+        self.test_config.set('action-managed-upgrade', True)
+
+        hooks.hooks.execute(['hooks/config-changed'])
+
+        self.assertFalse(self.do_openstack_upgrade.called)
+
     def test_db_changed(self):
         'It writes out cinder.conf on db changed'
         self.relation_get.return_value = 'cinder/0 cinder/1'