Merge lp:~ack/charms/trusty/glance/pause-and-resume into lp:~openstack-charmers-archive/charms/trusty/glance/next

[Alberto Donato]

This branch adds pause/resume actions that can be used to pause the service for maintenance on a unit.

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

charm_lint_check #8824 glance-next for ack mp269369
    LINT OK: passed

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

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

charm_unit_test #8152 glance-next for ack mp269369
    UNIT OK: passed

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

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

charm_amulet_test #6058 glance-next for ack mp269369
    AMULET OK: passed

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

[lp:~ack/charms/trusty/glance/pause-and-resume]

157. By Alberto Donato on 2015-08-28

Expand description.

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

charm_lint_check #8933 glance-next for ack mp269369
    LINT OK: passed

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

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

charm_unit_test #8254 glance-next for ack mp269369
    UNIT OK: passed

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

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

charm_amulet_test #6079 glance-next for ack mp269369
    AMULET OK: passed

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

[Billy Olsen (billy-olsen)]

Please fix inline comments below

review: Needs Fixing

[lp:~ack/charms/trusty/glance/pause-and-resume]

158. By Alberto Donato on 2015-09-01

Drop leftover debug print.

[Alberto Donato (ack)]

> Please fix inline comments below

Fixed, thanks.

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

charm_lint_check #9154 glance-next for ack mp269369
    LINT OK: passed

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

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

charm_unit_test #8460 glance-next for ack mp269369
    UNIT OK: passed

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

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

charm_amulet_test #6166 glance-next for ack mp269369
    AMULET OK: passed

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

[Adam Collard (adam-collard)]

+1

review: Approve

[lp:~ack/charms/trusty/glance/pause-and-resume]

159. By Alberto Donato on 2015-09-02

Fix docstring.

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

charm_lint_check #9235 glance-next for ack mp269369
    LINT OK: passed

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

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

charm_unit_test #8538 glance-next for ack mp269369
    UNIT OK: passed

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

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

charm_amulet_test #6198 glance-next for ack mp269369
    AMULET OK: passed

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

[Billy Olsen (billy-olsen)]

Thanks Alberto! LGTM, Approved.

review: Approve

=== modified file '.coveragerc'
--- .coveragerc	2013-08-14 22:56:40 +0000
+++ .coveragerc	2015-09-02 11:42:23 +0000
@@ -4,3 +4,4 @@
     if __name__ == .__main__.:
 include=
     hooks/glance_*
+    actions/actions.py

=== modified file 'actions.yaml'
--- actions.yaml	2015-08-03 15:36:41 +0000
+++ actions.yaml	2015-09-02 11:42:23 +0000
@@ -2,3 +2,14 @@
   description: Reinstall glance from the openstack-origin-git repositories.
 openstack-upgrade:
   description: Perform openstack upgrades. Config option action-managed-upgrade must be set to True.
+pause:
+  description: |
+    Pause glance services.
+    If the glance deployment is clustered using the hacluster charm, the
+    corresponding hacluster unit on the node must first be paused as well.
+    Not doing so may lead to an interruption of service.
+resume:
+  description: |
+    Resume glance services.
+    If the glance deployment is clustered using the hacluster charm, the
+    corresponding hacluster unit on the node must be resumed as well.

=== added file 'actions/__init__.py'
=== added file 'actions/actions.py'
--- actions/actions.py	1970-01-01 00:00:00 +0000
+++ actions/actions.py	2015-09-02 11:42:23 +0000
@@ -0,0 +1,56 @@
+#!/usr/bin/python
+
+import sys
+import os
+
+from charmhelpers.core.host import service_pause, service_resume
+from charmhelpers.core.hookenv import action_fail, status_set
+
+from hooks.glance_utils import services
+
+
+def pause(args):
+    """Pause all the Glance services.
+
+    @raises Exception if any services fail to stop
+    """
+    for service in services():
+        stopped = service_pause(service)
+        if not stopped:
+            raise Exception("{} didn't stop cleanly.".format(service))
+    status_set(
+        "maintenance", "Paused. Use 'resume' action to resume normal service.")
+
+
+def resume(args):
+    """Resume all the Glance services.
+
+    @raises Exception if any services fail to start
+    """
+    for service in services():
+        started = service_resume(service)
+        if not started:
+            raise Exception("{} didn't start cleanly.".format(service))
+    status_set("active", "")
+
+
+# A dictionary of all the defined actions to callables (which take
+# parsed arguments).
+ACTIONS = {"pause": pause, "resume": resume}
+
+
+def main(args):
+    action_name = os.path.basename(args[0])
+    try:
+        action = ACTIONS[action_name]
+    except KeyError:
+        return "Action %s undefined" % action_name
+    else:
+        try:
+            action(args)
+        except Exception as e:
+            action_fail(str(e))
+
+
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

=== added symlink 'actions/charmhelpers'
=== target is u'../charmhelpers'
=== modified file 'actions/git_reinstall.py'
--- actions/git_reinstall.py	2015-04-15 16:29:59 +0000
+++ actions/git_reinstall.py	2015-09-02 11:42:23 +0000
@@ -1,9 +1,7 @@
 #!/usr/bin/python
-import sys
+
 import traceback
 
-sys.path.append('hooks/')
-
 from charmhelpers.contrib.openstack.utils import (
     git_install_requested,
 )
@@ -14,11 +12,11 @@
     config,
 )
 
-from glance_utils import (
+from hooks.glance_utils import (
     git_install,
 )
 
-from glance_relations import (
+from hooks.glance_relations import (
     config_changed,
 )
 

=== added symlink 'actions/hooks'
=== target is u'../hooks'
=== modified file 'actions/openstack_upgrade.py'
--- actions/openstack_upgrade.py	2015-08-14 15:55:32 +0000
+++ actions/openstack_upgrade.py	2015-09-02 11:42:23 +0000
@@ -1,8 +1,7 @@
 #!/usr/bin/python
-import sys
+
 import traceback
 
-sys.path.append('hooks/')
 
 from charmhelpers.core.hookenv import (
     action_set,
@@ -10,7 +9,7 @@
     config
 )
 
-from glance_relations import config_changed
+from hooks.glance_relations import config_changed
 
 from charmhelpers.contrib.openstack.utils import (
     juju_log,
@@ -18,7 +17,7 @@
     openstack_upgrade_available
 )
 
-from glance_utils import (
+from hooks.glance_utils import (
     do_openstack_upgrade,
     register_configs
 )

=== added symlink 'actions/pause'
=== target is u'actions.py'
=== added symlink 'actions/resume'
=== target is u'actions.py'
=== modified file 'charm-helpers-hooks.yaml'
--- charm-helpers-hooks.yaml	2015-07-31 13:10:57 +0000
+++ charm-helpers-hooks.yaml	2015-09-02 11:42:23 +0000
@@ -1,5 +1,5 @@
 branch: lp:charm-helpers
-destination: hooks/charmhelpers
+destination: charmhelpers
 include:
     - core
     - cli

=== renamed directory 'hooks/charmhelpers' => 'charmhelpers'
=== added symlink 'hooks/charmhelpers'
=== target is u'../charmhelpers'
=== modified file 'hooks/glance_utils.py'
--- hooks/glance_utils.py	2015-06-04 08:44:46 +0000
+++ hooks/glance_utils.py	2015-09-02 11:42:23 +0000
@@ -3,6 +3,7 @@
 import os
 import shutil
 import subprocess
+from itertools import chain
 
 import glance_contexts
 
@@ -227,15 +228,13 @@
 #                  mysql might be restarting or suchlike.
 @retry_on_exception(5, base_delay=3, exc_type=subprocess.CalledProcessError)
 def determine_packages():
-    packages = [] + PACKAGES
+    packages = set(PACKAGES)
 
     if git_install_requested():
-        packages.extend(BASE_GIT_PACKAGES)
-        # don't include packages that will be installed from git
-        for p in GIT_PACKAGE_BLACKLIST:
-            packages.remove(p)
+        packages |= set(BASE_GIT_PACKAGES)
+        packages -= set(GIT_PACKAGE_BLACKLIST)
 
-    return list(set(packages))
+    return sorted(packages)
 
 
 def migrate_database():
@@ -296,11 +295,8 @@
 
 
 def services():
-    ''' Returns a list of services associate with this charm '''
-    _services = []
-    for v in restart_map().values():
-        _services = _services + v
-    return list(set(_services))
+    ''' Returns a list of (unique) services associate with this charm '''
+    return list(set(chain(*restart_map().values())))
 
 
 def setup_ipv6():

=== modified file 'tests/basic_deployment.py'
--- tests/basic_deployment.py	2015-07-13 16:07:29 +0000
+++ tests/basic_deployment.py	2015-09-02 11:42:23 +0000
@@ -28,6 +28,8 @@
     relations, service status, endpoint service catalog, create and
     delete new image."""
 
+    SERVICES = ('apache2', 'haproxy', 'glance-api', 'glance-registry')
+
     def __init__(self, series=None, openstack=None, source=None, git=False,
                  stable=False):
         """Deploy the entire test environment."""
@@ -40,6 +42,21 @@
         self._deploy()
         self._initialize_tests()
 
+    def _assert_services(self, should_run):
+        u.get_unit_process_ids(
+            {self.glance_sentry: self.SERVICES},
+            expect_success=should_run)
+
+    def get_service_overrides(self, unit):
+        """
+        Return a dict mapping service names to a boolean indicating whether
+        an override file exists for that service.
+        """
+        init_contents = unit.directory_contents("/etc/init/")
+        return {
+            service: "{}.override".format(service) in init_contents["files"]
+            for service in self.SERVICES}
+
     def _add_services(self):
         """Add services
 
@@ -544,3 +561,21 @@
             sleep_time = 0
 
         self.d.configure(juju_service, set_default)
+
+    def test_901_pause_resume(self):
+        """Test pause and resume actions."""
+        unit_name = "glance/0"
+        unit = self.d.sentry.unit[unit_name]
+        self._assert_services(should_run=True)
+        action_id = u.run_action(unit, "pause")
+        assert u.wait_on_action(action_id), "Pause action failed."
+
+        self._assert_services(should_run=False)
+        assert all(self.get_service_overrides(unit).itervalues()), \
+            "Not all override files were created."
+
+        action_id = u.run_action(unit, "resume")
+        assert u.wait_on_action(action_id), "Resume action failed"
+        assert not any(self.get_service_overrides(unit).itervalues()), \
+            "Not all override files were removed."
+        self._assert_services(should_run=True)

=== modified file 'unit_tests/__init__.py'
--- unit_tests/__init__.py	2015-03-21 01:36:16 +0000
+++ unit_tests/__init__.py	2015-09-02 11:42:23 +0000
@@ -1,4 +0,0 @@
-import sys
-
-sys.path.append('actions/')
-sys.path.append('hooks/')

=== added file 'unit_tests/test_actions.py'
--- unit_tests/test_actions.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_actions.py	2015-09-02 11:42:23 +0000
@@ -0,0 +1,157 @@
+import os
+import mock
+
+os.environ['JUJU_UNIT_NAME'] = 'glance'
+
+from test_utils import CharmTestCase
+
+import actions.actions
+
+
+class PauseTestCase(CharmTestCase):
+
+    def setUp(self):
+        super(PauseTestCase, self).setUp(
+            actions.actions, ["service_pause", "status_set"])
+
+    def test_pauses_services(self):
+        """Pause action pauses all Glance services."""
+        pause_calls = []
+
+        def fake_service_pause(svc):
+            pause_calls.append(svc)
+            return True
+
+        self.service_pause.side_effect = fake_service_pause
+
+        actions.actions.pause([])
+        self.assertItemsEqual(
+            pause_calls,
+            ['glance-api', 'glance-registry', 'haproxy', 'apache2'])
+
+    def test_bails_out_early_on_error(self):
+        """Pause action fails early if there are errors stopping a service."""
+        pause_calls = []
+
+        def maybe_kill(svc):
+            if svc == "glance-registry":
+                return False
+            else:
+                pause_calls.append(svc)
+                return True
+
+        self.service_pause.side_effect = maybe_kill
+        self.assertRaisesRegexp(
+            Exception, "glance-registry didn't stop cleanly.",
+            actions.actions.pause, [])
+        self.assertEqual(pause_calls, ['haproxy', 'glance-api'])
+
+    def test_status_mode(self):
+        """Pause action sets the status to maintenance."""
+        status_calls = []
+        self.status_set.side_effect = lambda state, msg: status_calls.append(
+            state)
+
+        actions.actions.pause([])
+        self.assertEqual(status_calls, ["maintenance"])
+
+    def test_status_message(self):
+        """Pause action sets a status message reflecting that it's paused."""
+        status_calls = []
+        self.status_set.side_effect = lambda state, msg: status_calls.append(
+            msg)
+
+        actions.actions.pause([])
+        self.assertEqual(
+            status_calls, ["Paused. "
+                           "Use 'resume' action to resume normal service."])
+
+
+class ResumeTestCase(CharmTestCase):
+
+    def setUp(self):
+        super(ResumeTestCase, self).setUp(
+            actions.actions, ["service_resume", "status_set"])
+
+    def test_resumes_services(self):
+        """Resume action resumes all Glance services."""
+        resume_calls = []
+
+        def fake_service_resume(svc):
+            resume_calls.append(svc)
+            return True
+
+        self.service_resume.side_effect = fake_service_resume
+        actions.actions.resume([])
+        self.assertItemsEqual(
+            resume_calls,
+            ['glance-api', 'glance-registry', 'haproxy', 'apache2'])
+
+    def test_bails_out_early_on_error(self):
+        """Resume action fails early if there are errors starting a service."""
+        resume_calls = []
+
+        def maybe_kill(svc):
+            if svc == "glance-registry":
+                return False
+            else:
+                resume_calls.append(svc)
+                return True
+
+        self.service_resume.side_effect = maybe_kill
+        self.assertRaisesRegexp(
+            Exception, "glance-registry didn't start cleanly.",
+            actions.actions.resume, [])
+        self.assertEqual(resume_calls, ['haproxy', 'glance-api'])
+
+    def test_status_mode(self):
+        """Resume action sets the status to active."""
+        status_calls = []
+        self.status_set.side_effect = lambda state, msg: status_calls.append(
+            state)
+
+        actions.actions.resume([])
+        self.assertEqual(status_calls, ["active"])
+
+    def test_status_message(self):
+        """Resume action sets an empty status message."""
+        status_calls = []
+        self.status_set.side_effect = lambda state, msg: status_calls.append(
+            msg)
+
+        actions.actions.resume([])
+        self.assertEqual(status_calls, [""])
+
+
+class MainTestCase(CharmTestCase):
+
+    def setUp(self):
+        super(MainTestCase, self).setUp(actions.actions, ["action_fail"])
+
+    def test_invokes_action(self):
+        dummy_calls = []
+
+        def dummy_action(args):
+            dummy_calls.append(True)
+
+        with mock.patch.dict(actions.actions.ACTIONS, {"foo": dummy_action}):
+            actions.actions.main(["foo"])
+        self.assertEqual(dummy_calls, [True])
+
+    def test_unknown_action(self):
+        """Unknown actions aren't a traceback."""
+        exit_string = actions.actions.main(["foo"])
+        self.assertEqual("Action foo undefined", exit_string)
+
+    def test_failing_action(self):
+        """Actions which traceback trigger action_fail() calls."""
+        dummy_calls = []
+
+        self.action_fail.side_effect = dummy_calls.append
+
+        def dummy_action(args):
+            raise ValueError("uh oh")
+
+        with mock.patch.dict(actions.actions.ACTIONS, {"foo": dummy_action}):
+            actions.actions.main(["foo"])
+        self.assertEqual(dummy_calls, ["uh oh"])

=== modified file 'unit_tests/test_actions_git_reinstall.py'
--- unit_tests/test_actions_git_reinstall.py	2015-04-15 16:29:59 +0000
+++ unit_tests/test_actions_git_reinstall.py	2015-09-02 11:42:23 +0000
@@ -3,8 +3,9 @@
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
 
-with patch('glance_utils.register_configs') as register_configs:
-    import git_reinstall
+with patch('charmhelpers.core.hookenv.config') as config:
+    with patch('actions.hooks.glance_utils.register_configs'):
+        from actions import git_reinstall
 
 from test_utils import (
     CharmTestCase
@@ -35,10 +36,9 @@
     @patch.object(git_reinstall, 'action_fail')
     @patch.object(git_reinstall, 'git_install')
     @patch.object(git_reinstall, 'config_changed')
-    @patch('charmhelpers.contrib.openstack.utils.config')
-    def test_git_reinstall(self, _config, config_changed, git_install,
-                           action_fail, action_set):
-        _config.return_value = openstack_origin_git
+    def test_git_reinstall(self, config_changed, git_install, action_fail,
+                           action_set):
+        config.return_value = openstack_origin_git
         self.test_config.set('openstack-origin-git', openstack_origin_git)
 
         git_reinstall.git_reinstall()
@@ -53,11 +53,9 @@
     @patch.object(git_reinstall, 'action_fail')
     @patch.object(git_reinstall, 'git_install')
     @patch.object(git_reinstall, 'config_changed')
-    @patch('charmhelpers.contrib.openstack.utils.config')
-    def test_git_reinstall_not_configured(self, _config, config_changed,
-                                          git_install, action_fail,
-                                          action_set):
-        _config.return_value = None
+    def test_git_reinstall_not_configured(self, config_changed, git_install,
+                                          action_fail, action_set):
+        config.return_value = None
 
         git_reinstall.git_reinstall()
 
@@ -71,11 +69,9 @@
     @patch.object(git_reinstall, 'git_install')
     @patch.object(git_reinstall, 'config_changed')
     @patch('traceback.format_exc')
-    @patch('charmhelpers.contrib.openstack.utils.config')
-    def test_git_reinstall_exception(self, _config, format_exc,
-                                     config_changed, git_install, action_fail,
-                                     action_set):
-        _config.return_value = openstack_origin_git
+    def test_git_reinstall_exception(self, format_exc, config_changed,
+                                     git_install, action_fail, action_set):
+        config.return_value = openstack_origin_git
         e = OSError('something bad happened')
         git_install.side_effect = e
         traceback = (

=== modified file 'unit_tests/test_actions_openstack_upgrade.py'
--- unit_tests/test_actions_openstack_upgrade.py	2015-08-14 15:55:32 +0000
+++ unit_tests/test_actions_openstack_upgrade.py	2015-09-02 11:42:23 +0000
@@ -3,8 +3,9 @@
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
 
-with patch('glance_utils.register_configs') as register_configs:
-    import openstack_upgrade
+with patch('actions.hooks.glance_utils.register_configs'):
+    with patch('hooks.glance_utils.register_configs'):
+        from actions import openstack_upgrade
 
 from test_utils import (
     CharmTestCase
@@ -27,12 +28,12 @@
     @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,
+    @patch('subprocess.check_output')
+    def test_openstack_upgrade(self, _check_output, config_changed,
                                openstack_upgrade_available,
                                do_openstack_upgrade, action_fail,
                                action_set):
-        _config.return_value = None
+        _check_output.return_value = 'null'
         openstack_upgrade_available.return_value = True
 
         self.test_config.set('action-managed-upgrade', True)
@@ -47,12 +48,13 @@
     @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,
+    @patch('subprocess.check_output')
+    def test_openstack_upgrade_not_configured(self, _check_output,
+                                              config_changed,
                                               openstack_upgrade_available,
                                               do_openstack_upgrade,
                                               action_set):
-        _config.return_value = None
+        _check_output.return_value = 'null'
         openstack_upgrade_available.return_value = True
 
         openstack_upgrade.openstack_upgrade()
@@ -66,14 +68,12 @@
     @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,
+    @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):
-
-        self.test_config.set('action-managed-upgrade', True)
-        self.test_config.set('openstack-origin-git', True)
+                                           do_openstack_upgrade, action_set):
+        git_install_requested.return_value = True
 
         openstack_upgrade.openstack_upgrade()
 
@@ -87,7 +87,7 @@
     @patch.object(openstack_upgrade, 'openstack_upgrade_available')
     @patch.object(openstack_upgrade, 'config_changed')
     @patch('traceback.format_exc')
-    @patch('charmhelpers.contrib.openstack.utils.config')
+    @patch('charmhelpers.core.hookenv.config')
     def test_openstack_upgrade_exception(self, _config, format_exc,
                                          config_changed,
                                          openstack_upgrade_available,

=== modified file 'unit_tests/test_glance_contexts.py'
--- unit_tests/test_glance_contexts.py	2014-10-07 15:50:12 +0000
+++ unit_tests/test_glance_contexts.py	2015-09-02 11:42:23 +0000
@@ -1,11 +1,14 @@
-import glance_contexts as contexts
 from mock import patch, MagicMock
 
+from hooks import glance_contexts as contexts
+
+
 from test_utils import (
     CharmTestCase
 )
 
 TO_PATCH = [
+    "config",
     'relation_ids',
     'is_relation_made',
     'service_name',
@@ -18,6 +21,9 @@
 
     def setUp(self):
         super(TestGlanceContexts, self).setUp(contexts, TO_PATCH)
+        from charmhelpers.core.hookenv import cache
+        self.cache = cache
+        cache.clear()
 
     def test_swift_not_related(self):
         self.relation_ids.return_value = []
@@ -55,52 +61,38 @@
                           {'known_stores': "glance.store.filesystem.Store,"
                                            "glance.store.http.Store"})
 
-    @patch('charmhelpers.contrib.openstack.context.config')
-    @patch('charmhelpers.contrib.openstack.context.is_clustered')
-    @patch('charmhelpers.contrib.openstack.context.determine_apache_port')
-    @patch('charmhelpers.contrib.openstack.context.determine_api_port')
-    @patch('charmhelpers.contrib.openstack.context.unit_get')
+    @patch('charmhelpers.contrib.hahelpers.cluster.config_get')
     @patch('charmhelpers.contrib.openstack.context.https')
     def test_apache_ssl_context_service_enabled(self, mock_https,
-                                                mock_unit_get,
-                                                mock_determine_api_port,
-                                                mock_determine_apache_port,
-                                                mock_is_clustered,
                                                 mock_config):
+        mock_config.return_value = 'true'
         mock_https.return_value = True
-        mock_unit_get.return_value = '1.2.3.4'
-        mock_determine_api_port.return_value = '12'
-        mock_determine_apache_port.return_value = '34'
-        mock_is_clustered.return_value = False
 
         ctxt = contexts.ApacheSSLContext()
         ctxt.enable_modules = MagicMock()
         ctxt.configure_cert = MagicMock()
         ctxt.configure_ca = MagicMock()
         ctxt.canonical_names = MagicMock()
+        ctxt.get_network_addresses = MagicMock()
+        ctxt.get_network_addresses.return_value = [('1.2.3.4', '1.2.3.4')]
+
         self.assertEquals(ctxt(), {'endpoints': [('1.2.3.4', '1.2.3.4',
-                                                  34, 12)],
-                                   'ext_ports': [34],
+                                                  9282, 9272)],
+                                   'ext_ports': [9282],
                                    'namespace': 'glance'})
-        self.assertTrue(mock_https.called)
-        mock_unit_get.assert_called_with('private-address')
 
-    @patch('charmhelpers.contrib.openstack.context.config')
-    @patch('glance_contexts.config')
-    def test_glance_ipv6_context_service_enabled(self, mock_config,
-                                                 mock_context_config):
-        mock_config.return_value = True
-        mock_context_config.return_value = True
+    @patch("subprocess.check_output")
+    def test_glance_ipv6_context_service_enabled(self, mock_subprocess):
+        self.config.return_value = True
+        mock_subprocess.return_value = 'true'
         ctxt = contexts.GlanceIPv6Context()
         self.assertEquals(ctxt(), {'bind_host': '::',
                                    'registry_host': '[::]'})
 
-    @patch('charmhelpers.contrib.openstack.context.config')
-    @patch('glance_contexts.config')
-    def test_glance_ipv6_context_service_disabled(self, mock_config,
-                                                  mock_context_config):
-        mock_config.return_value = False
-        mock_context_config.return_value = False
+    @patch("subprocess.check_output")
+    def test_glance_ipv6_context_service_disabled(self, mock_subprocess):
+        self.config.return_value = False
+        mock_subprocess.return_value = 'false'
         ctxt = contexts.GlanceIPv6Context()
         self.assertEquals(ctxt(), {'bind_host': '0.0.0.0',
                                    'registry_host': '0.0.0.0'})

=== modified file 'unit_tests/test_glance_relations.py'
--- unit_tests/test_glance_relations.py	2015-08-10 15:21:34 +0000
+++ unit_tests/test_glance_relations.py	2015-09-02 11:42:23 +0000
@@ -6,7 +6,7 @@
 from test_utils import CharmTestCase
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
-import glance_utils as utils
+import hooks.glance_utils as utils
 
 _reg = utils.register_configs
 _map = utils.restart_map
@@ -14,7 +14,7 @@
 utils.register_configs = MagicMock()
 utils.restart_map = MagicMock()
 
-import glance_relations as relations
+import hooks.glance_relations as relations
 
 relations.hooks._config_save = False
 
@@ -47,7 +47,7 @@
     'openstack_upgrade_available',
     # charmhelpers.contrib.hahelpers.cluster_utils
     'is_elected_leader',
-    # glance_utils
+    # hooks.glance_utils
     'restart_map',
     'register_configs',
     'do_openstack_upgrade',
@@ -86,11 +86,10 @@
         relations.install_hook()
         self.configure_installation_source.assert_called_with(repo)
         self.apt_update.assert_called_with(fatal=True)
-        self.apt_install.assert_called_with(['haproxy', 'python-six', 'uuid',
-                                             'python-mysqldb', 'apache2',
-                                             'python-psycopg2', 'glance',
-                                             'python-keystone',
-                                             'python-swiftclient'], fatal=True)
+        self.apt_install.assert_called_with(
+            ['apache2', 'glance', 'haproxy', 'python-keystone',
+             'python-mysqldb', 'python-psycopg2', 'python-six',
+             'python-swiftclient', 'uuid'], fatal=True)
         self.assertTrue(self.execd_preinstall.called)
         self.git_install.assert_called_with(None)
 
@@ -128,17 +127,12 @@
         self.assertTrue(self.execd_preinstall.called)
         self.configure_installation_source.assert_called_with(repo)
         self.apt_update.assert_called_with(fatal=True)
-        self.apt_install.assert_called_with(['haproxy', 'python-setuptools',
-                                             'python-six', 'uuid',
-                                             'python-mysqldb',
-                                             'libmysqlclient-dev',
-                                             'libssl-dev', 'libffi-dev',
-                                             'apache2', 'python-pip',
-                                             'libxslt1-dev', 'libyaml-dev',
-                                             'python-psycopg2',
-                                             'zlib1g-dev', 'python-dev',
-                                             'libxml2-dev'],
-                                            fatal=True)
+        self.apt_install.assert_called_with(
+            ['apache2', 'haproxy', 'libffi-dev', 'libmysqlclient-dev',
+             'libssl-dev', 'libxml2-dev', 'libxslt1-dev', 'libyaml-dev',
+             'python-dev', 'python-mysqldb', 'python-pip', 'python-psycopg2',
+             'python-setuptools', 'python-six', 'uuid', 'zlib1g-dev'],
+            fatal=True)
         self.git_install.assert_called_with(projects_yaml)
 
     def test_db_joined(self):
@@ -398,8 +392,8 @@
             'Could not create ceph keyring: peer not ready?'
         )
 
-    @patch("glance_relations.relation_set")
-    @patch("glance_relations.relation_get")
+    @patch("hooks.glance_relations.relation_set")
+    @patch("hooks.glance_relations.relation_get")
     @patch.object(relations, 'CONFIGS')
     def test_ceph_changed_broker_send_rq(self, configs, mock_relation_get,
                                          mock_relation_set):
@@ -420,7 +414,7 @@
             self.assertNotIn(c, configs.write.call_args_list)
 
     @patch("charmhelpers.core.host.service")
-    @patch("glance_relations.relation_get", autospec=True)
+    @patch("hooks.glance_relations.relation_get", autospec=True)
     @patch.object(relations, 'CONFIGS')
     def test_ceph_changed_with_key_and_relation_data(self, configs,
                                                      mock_relation_get,
@@ -472,15 +466,14 @@
         }
         self.relation_set.assert_called_with(**ex)
 
-    @patch('charmhelpers.contrib.openstack.ip.is_clustered')
-    @patch('charmhelpers.contrib.openstack.ip.unit_get')
-    @patch('charmhelpers.contrib.openstack.ip.config')
-    def test_keystone_joined_public_endpoint(self, _config, _unit_get,
-                                             _is_clustered):
-        _unit_get.return_value = 'glancehost'
-        _is_clustered.return_value = False
+    @patch.object(relations, 'canonical_url')
+    def test_keystone_joined_public_endpoint(self, _canonical_url):
+        def fake_canonical_url(configs, endpoint_type):
+            return {"public": "http://glance.example.com",
+                    "int": "http://glancehost",
+                    "admin": "http://glancehost"}[endpoint_type]
+        _canonical_url.side_effect = fake_canonical_url
         self.test_config.set('os-public-hostname', 'glance.example.com')
-        _config.side_effect = self.test_config.get
         relations.keystone_joined()
         ex = {
             'region': 'RegionOne',

=== modified file 'unit_tests/test_glance_utils.py'
--- unit_tests/test_glance_utils.py	2015-06-04 08:44:46 +0000
+++ unit_tests/test_glance_utils.py	2015-09-02 11:42:23 +0000
@@ -4,7 +4,9 @@
 import os
 
 os.environ['JUJU_UNIT_NAME'] = 'glance'
-import glance_utils as utils
+
+with patch('charmhelpers.core.hookenv.config') as config:
+    import hooks.glance_utils as utils
 
 from test_utils import (
     CharmTestCase,
@@ -131,16 +133,16 @@
         ])
         self.assertEquals(ex_map, utils.restart_map())
 
-    @patch('charmhelpers.contrib.openstack.utils.config')
-    def test_determine_packages(self, _config):
-        _config.return_value = None
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages(self, git_install_requested):
+        git_install_requested.return_value = False
         result = utils.determine_packages()
         ex = utils.PACKAGES
         self.assertEquals(set(ex), set(result))
 
-    @patch('charmhelpers.contrib.openstack.utils.config')
-    def test_determine_packages_git(self, _config):
-        _config.return_value = openstack_origin_git
+    @patch.object(utils, 'git_install_requested')
+    def test_determine_packages_git(self, git_install_requested):
+        git_install_requested.return_value = True
         result = utils.determine_packages()
         ex = utils.PACKAGES + utils.BASE_GIT_PACKAGES
         for p in utils.GIT_PACKAGE_BLACKLIST: