Merge lp:~freyes/charms/trusty/nova-cloud-controller/bug-989337 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Felipe Reyes]

This branch extends the charm to install python-memcache, and configure nova.conf adding the key memcached_servers when a relationship with memcached service is established.

If multiple units of memcached are available, all of them are used (memcached_servers = host1:port1,host2:port,host3:port3)

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #771 nova-cloud-controller-next for freyes mp239671
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.771:
I: config.yaml: option haproxy-client-timeout has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-network has no default value

Full lint output: http://paste.ubuntu.com/8694351/
Build: http://10.98.191.181:8080/job/charm_lint_check/771/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #579 nova-cloud-controller-next for freyes mp239671
    UNIT FAIL: unit-test failed

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.579:
Ran 4 tests in 0.150s

FAILED (errors=2)
make: *** [unit_test] Error 1

Full unit output: http://paste.ubuntu.com/8694352/
Build: http://10.98.191.181:8080/job/charm_unit_test/579/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #304 nova-cloud-controller-next for freyes mp239671
    AMULET OK: believed to pass, but you should confirm results

AMULET Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.304:
juju-test.conductor DEBUG : Tearing down osci-sv05 juju environment
juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv05"
WARNING cannot delete security group "juju-osci-sv05-0". Used by another environment?
juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet output: http://paste.ubuntu.com/8694683/
Build: http://10.98.191.181:8080/job/charm_amulet_test/304/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #582 nova-cloud-controller-next for freyes mp239671
    UNIT FAIL: unit-test failed

UNIT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_unit_test/unit-test.582:
Ran 4 tests in 0.153s

FAILED (errors=2)
make: *** [unit_test] Error 1

Full unit output: http://paste.ubuntu.com/8705925/
Build: http://10.98.191.181:8080/job/charm_unit_test/582/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #774 nova-cloud-controller-next for freyes mp239671
    LINT OK: believed to pass, but you should confirm results

LINT Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_lint_check/make-lint.774:
I: config.yaml: option haproxy-client-timeout has no default value
I: config.yaml: option ssl_cert has no default value
I: config.yaml: option nvp-l3-uuid has no default value
I: config.yaml: option os-internal-network has no default value

Full lint output: http://paste.ubuntu.com/8705924/
Build: http://10.98.191.181:8080/job/charm_lint_check/774/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #307 nova-cloud-controller-next for freyes mp239671
    AMULET FAIL: amulet-test failed

AMULET Results (max last 4 lines) from
/var/lib/jenkins/workspace/charm_amulet_test/make-test.307:
    return self.read(buflen)
  File "/usr/lib/python2.7/ssl.py", line 260, in read
    return self._sslobj.read(len)
socket.error: [Errno 110] Connection timed out

Full amulet output: http://paste.ubuntu.com/8706467/
Build: http://10.98.191.181:8080/job/charm_amulet_test/307/

[Edward Hope-Morley (hopem)]

I'm getting a couple of unit test failures here. Looks like a couple of extra mocks needed - see attached u/t output.

review: Needs Fixing

[Edward Hope-Morley (hopem)]

Hmm can't attach so pasting:

$ make unit_test
Starting unit tests...
nose.plugins.cover: ERROR: Coverage not available: unable to import coverage module
test_instance_console_context_with_memcache (unit_tests.test_nova_cc_contexts.NovaComputeContextTests) ... ok
test_instance_console_context_without_memcache (unit_tests.test_nova_cc_contexts.NovaComputeContextTests) ... ok
Failure: OSError ([Errno 2] No such file or directory) ... ERROR
Failure: OSError ([Errno 2] No such file or directory) ... ERROR

======================================================================
ERROR: Failure: OSError ([Errno 2] No such file or directory)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 411, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 47, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 94, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/gizmo/Documents/reviews/nova-cloud-controller/bug-989337/unit_tests/test_nova_cc_hooks.py", line 6, in <module>
    import nova_cc_utils as utils
  File "hooks/nova_cc_utils.py", line 142, in <module>
    nova_cc_context.NeutronPostgresqlDBContext(),
  File "hooks/nova_cc_context.py", line 268, in __init__
    self).__init__(config('neutron-database'))
  File "hooks/charmhelpers/core/hookenv.py", line 44, in wrapper
    res = func(*args, **kwargs)
  File "hooks/charmhelpers/core/hookenv.py", line 281, in config
    config_data = json.loads(subprocess.check_output(config_cmd_line))
  File "/usr/lib/python2.7/subprocess.py", line 566, in check_output
    process = Popen(stdout=PIPE, *popenargs, **kwargs)
  File "/usr/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/usr/lib/python2.7/subprocess.py", line 1327, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory

======================================================================
ERROR: Failure: OSError ([Errno 2] No such file or directory)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/nose/loader.py", line 411, in loadTestsFromName
    addr.filename, addr.module)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 47, in importFromPath
    return self.importFromDir(dir_path, fqname)
  File "/usr/lib/python2.7/dist-packages/nose/importer.py", line 94, in importFromDir
    mod = load_module(part_fqname, fh, filename, desc)
  File "/home/gizmo/Documents/reviews/nova-cloud-controller/bug-989337/unit_tests/test_nova_cc_utils.py", line 11, in <module>
    import nova_cc_utils as utils
  File "hooks/nova_cc_utils.py", line 142, in <module>
    nova_cc_context.NeutronPostgresqlDBContext(),
  File "hooks/nova_cc_context.py", line 268, in __init__
    self).__init__(config('neutron-database'))
  File "hooks/charmhelpers/core/hookenv.py", line 44, in wrapper
    res = func(*args, **kwa...

[Edward Hope-Morley (hopem)]

FWIW, other than the above this lgtm

[lp:~freyes/charms/trusty/nova-cloud-controller/bug-989337]

124. By Felipe Reyes on 2014-11-04

Changed the way charmhelpers.core.hookenv.config is imported

This change allows to easily monkey patch the function with a mock,
otherwise the 'config' function is left imported at the module level.

[Felipe Reyes (freyes)]

Edward, I fixed the broken tests, the patch was a little bit larger than what I expected, but they are working OK now.

Name Stmts Miss Cover Missing
-----------------------------------------------------
hooks/nova_cc_context 166 112 33% 21-28, 39-41, 48-59, 65-79, 86-104, 116-169, 180-195, 203-204, 208, 212-214, 219, 222-236, 242-256, 273-276, 281-283, 297-299
hooks/nova_cc_hooks 447 146 67% 132-135, 148-149, 173, 184-185, 189, 224, 229-234, 245, 325-328, 336-339, 345-348, 358-374, 383-385, 395-409, 413-422, 508, 518, 522-523, 576, 582-592, 597-608, 618-628, 633-672, 682-697, 705-709, 734-743, 767, 772-780, 806, 861, 865-868
hooks/nova_cc_utils 442 111 75% 296-301, 312-315, 325-326, 382, 384, 428-430, 434, 448-456, 463-468, 472-486, 592-594, 599-602, 607, 611, 635-636, 650-652, 673-674, 680-703, 707-713, 717-723, 729, 735, 742, 753-757, 842, 902-908, 912-914, 918-921, 925-937
-----------------------------------------------------
TOTAL 1055 369 65%
----------------------------------------------------------------------
Ran 99 tests in 7.518s

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_lint_check #922 nova-cloud-controller-next for freyes mp239671
    LINT OK: passed

LINT Results (max last 5 lines):
  I: config.yaml: option os-admin-network has no default value
  I: config.yaml: option haproxy-client-timeout has no default value
  I: config.yaml: option ssl_cert has no default value
  I: config.yaml: option nvp-l3-uuid has no default value
  I: config.yaml: option os-internal-network has no default value

Full lint test output: http://paste.ubuntu.com/8822840/
Build: http://10.98.191.181:8080/job/charm_lint_check/922/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_unit_test #757 nova-cloud-controller-next for freyes mp239671
    UNIT OK: passed

UNIT Results (max last 5 lines):
  hooks/nova_cc_hooks 447 146 67% 132-135, 148-149, 173, 184-185, 189, 224, 229-234, 245, 325-328, 336-339, 345-348, 358-374, 383-385, 395-409, 413-422, 508, 518, 522-523, 576, 582-592, 597-608, 618-628, 633-672, 682-697, 705-709, 734-743, 767, 772-780, 806, 861, 865-868
  hooks/nova_cc_utils 442 111 75% 296-301, 312-315, 325-326, 382, 384, 428-430, 434, 448-456, 463-468, 472-486, 592-594, 599-602, 607, 611, 635-636, 650-652, 673-674, 680-703, 707-713, 717-723, 729, 735, 742, 753-757, 842, 902-908, 912-914, 918-921, 925-937
  TOTAL 1055 369 65%
  Ran 99 tests in 8.707s
  OK

Full unit test output: http://paste.ubuntu.com/8822843/
Build: http://10.98.191.181:8080/job/charm_unit_test/757/

[Ryan Beisner (1chb1n)]

UOSCI bot says:
charm_amulet_test #340 nova-cloud-controller-next for freyes mp239671
    AMULET OK: passed

AMULET Results (max last 5 lines):
  juju-test.conductor.15-basic-trusty-icehouse RESULT :
  juju-test.conductor DEBUG : Tearing down osci-sv07 juju environment
  juju-test.conductor DEBUG : Calling "juju destroy-environment -y osci-sv07"
  WARNING cannot delete security group "juju-osci-sv07-0". Used by another environment?
  juju-test INFO : Results: 3 passed, 0 failed, 0 errored

Full amulet test output: http://paste.ubuntu.com/8823194/
Build: http://10.98.191.181:8080/job/charm_amulet_test/340/

[lp:~freyes/charms/trusty/nova-cloud-controller/bug-989337]

125. By Felipe Reyes on 2014-11-20

Revert "Changed the way charmhelpers.core.hookenv.config is imported"

126. By Felipe Reyes on 2014-11-20

Patch nova_cc_utils config() before it's imported by nova_cc_context

127. By Felipe Reyes on 2014-11-20

Format message, set proper level and include exception

128. By Felipe Reyes on 2014-11-20

Renamed relation from 'cache' to 'memcache'

129. By Felipe Reyes on 2014-11-20

Commit after merge

130. By Felipe Reyes on 2014-11-20

Commit after pulling changes from upstream

131. By Felipe Reyes on 2014-11-26

Added IPv6 support

Added test to check that IPv6 addresses are properly formatted.

132. By Felipe Reyes on 2014-12-15

Commit after merge

133. By Felipe Reyes on 2014-12-15

Replace "Couldn't get caching servers" with "Couldn't get memcache servers"

134. By Felipe Reyes on 2014-12-16

Refactor the way memcached_servers config is put in the templates

Instead of formatting the string with Jinja2, it's formatted with python
and passed to the template as a string.

Unmerged revisions

=== added symlink 'hooks/cache-relation-broken'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/cache-relation-changed'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/cache-relation-departed'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/cache-relation-joined'
=== target is u'nova_cc_hooks.py'
=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2014-10-13 16:18:58 +0000
+++ hooks/nova_cc_context.py	2014-11-04 18:12:57 +0000
@@ -1,7 +1,7 @@
 from charmhelpers.core.hookenv import (
-    config, relation_ids, relation_set, log, ERROR,
-    unit_get, related_units, relation_get)
-
+    relation_ids, relation_set, log, ERROR,
+    unit_get, related_units, relation_get, relations_for_id)
+from charmhelpers.core import hookenv
 from charmhelpers.fetch import apt_install, filter_installed_packages
 from charmhelpers.contrib.openstack import context, neutron, utils
 
@@ -181,14 +181,14 @@
     if https():
         scheme = 'https'
 
-    if config('prefer-ipv6'):
+    if hookenv.config('prefer-ipv6'):
         if is_clustered():
-            addr = '[%s]' % config(vip_setting)
+            addr = '[%s]' % hookenv.config(vip_setting)
         else:
-            addr = '[%s]' % get_ipv6_addr(exc_list=[config('vip')])[0]
+            addr = '[%s]' % get_ipv6_addr(exc_list=[hookenv.config('vip')])[0]
     else:
         if is_clustered():
-            addr = config(vip_setting)
+            addr = hookenv.config(vip_setting)
         else:
             addr = unit_get('private-address')
 
@@ -209,8 +209,8 @@
 
     @property
     def neutron_security_groups(self):
-        sec_groups = (config('neutron-security-groups') or
-                      config('quantum-security-groups'))
+        sec_groups = (hookenv.config('neutron-security-groups') or
+                      hookenv.config('quantum-security-groups'))
         return sec_groups.lower() == 'yes'
 
     def _ensure_packages(self):
@@ -220,9 +220,9 @@
 
     def __call__(self):
         ctxt = super(NeutronCCContext, self).__call__()
-        ctxt['external_network'] = config('neutron-external-network')
-        if config('quantum-plugin') in ['nvp', 'nsx']:
-            _config = config()
+        ctxt['external_network'] = hookenv.config('neutron-external-network')
+        if hookenv.config('quantum-plugin') in ['nvp', 'nsx']:
+            _config = hookenv.config()
             for k, v in _config.iteritems():
                 if k.startswith('nvp'):
                     ctxt[k.replace('-', '_')] = v
@@ -251,7 +251,7 @@
             ctxt['service_port']
         )
         ctxt['keystone_ec2_url'] = ec2_tokens
-        ctxt['region'] = config('region')
+        ctxt['region'] = hookenv.config('region')
 
         return ctxt
 
@@ -265,19 +265,38 @@
 
     def __init__(self):
         super(NeutronPostgresqlDBContext,
-              self).__init__(config('neutron-database'))
+              self).__init__(hookenv.config('neutron-database'))
 
 
 class NovaConfigContext(context.WorkerConfigContext):
     def __call__(self):
         ctxt = super(NovaConfigContext, self).__call__()
-        ctxt['cpu_allocation_ratio'] = config('cpu-allocation-ratio')
-        ctxt['ram_allocation_ratio'] = config('ram-allocation-ratio')
+        ctxt['cpu_allocation_ratio'] = hookenv.config('cpu-allocation-ratio')
+        ctxt['ram_allocation_ratio'] = hookenv.config('ram-allocation-ratio')
         return ctxt
 
 
 class NovaIPv6Context(context.BindHostContext):
     def __call__(self):
         ctxt = super(NovaIPv6Context, self).__call__()
-        ctxt['use_ipv6'] = config('prefer-ipv6')
+        ctxt['use_ipv6'] = hookenv.config('prefer-ipv6')
+        return ctxt
+
+
+class InstanceConsoleContext(context.OSContextGenerator):
+    interfaces = []
+
+    def __call__(self):
+        ctxt = {}
+        servers = []
+        try:
+            for rid in relation_ids('cache'):
+                for rel in relations_for_id(rid):
+                    servers.append({'private-address': rel['private-address'],
+                                    'port': rel['port']})
+        except Exception as ex:
+            log(str(ex))
+            servers = []
+
+        ctxt['memcached_servers'] = servers
         return ctxt

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-10-23 07:32:45 +0000
+++ hooks/nova_cc_hooks.py	2014-11-04 18:12:57 +0000
@@ -849,6 +849,15 @@
         quantum_joined(rid=rid)
 
 
[e-mail]('cache-relation-joined',
+            'cache-relation-departed',
+            'cache-relation-changed',
+            'cache-relation-broken')
+@restart_on_change(restart_map())
+def memcached_joined():
+    CONFIGS.write(NOVA_CONF)
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-10-23 16:39:43 +0000
+++ hooks/nova_cc_utils.py	2014-11-04 18:12:57 +0000
@@ -68,6 +68,7 @@
     'python-psycopg2',
     'python-psutil',
     'uuid',
+    'python-memcache',
 ]
 
 BASE_SERVICES = [
@@ -123,7 +124,8 @@
                      nova_cc_context.VolumeServiceContext(),
                      nova_cc_context.NovaIPv6Context(),
                      nova_cc_context.NeutronCCContext(),
-                     nova_cc_context.NovaConfigContext()],
+                     nova_cc_context.NovaConfigContext(),
+                     nova_cc_context.InstanceConsoleContext()],
     }),
     (NOVA_API_PASTE, {
         'services': [s for s in BASE_SERVICES if 'api' in s],

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-07-11 09:14:57 +0000
+++ metadata.yaml	2014-11-04 18:12:57 +0000
@@ -40,6 +40,8 @@
   nova-vmware:
     interface: nova-vmware
     scope: container
+  cache:
+    interface: memcache
 peers:
   cluster:
     interface: nova-ha

=== modified file 'templates/folsom/nova.conf'
--- templates/folsom/nova.conf	2014-04-16 08:25:14 +0000
+++ templates/folsom/nova.conf	2014-11-04 18:12:57 +0000
@@ -21,6 +21,11 @@
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
+
+{% if memcached_servers %}
+memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %}
+{% endif %}
+
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}

=== modified file 'templates/grizzly/nova.conf'
--- templates/grizzly/nova.conf	2014-03-31 11:56:09 +0000
+++ templates/grizzly/nova.conf	2014-11-04 18:12:57 +0000
@@ -20,6 +20,11 @@
 enabled_apis=ec2,osapi_compute,metadata
 auth_strategy=keystone
 compute_driver=libvirt.LibvirtDriver
+
+{% if memcached_servers %}
+memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %}
+{% endif %}
+
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}

=== modified file 'templates/havana/nova.conf'
--- templates/havana/nova.conf	2014-08-08 09:31:32 +0000
+++ templates/havana/nova.conf	2014-11-04 18:12:57 +0000
@@ -26,6 +26,10 @@
 cpu_allocation_ratio = {{ cpu_allocation_ratio }}
 use_syslog={{ use_syslog }}
 
+{% if memcached_servers %}
+memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %}
+{% endif %}
+
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}

=== modified file 'templates/icehouse/nova.conf'
--- templates/icehouse/nova.conf	2014-10-07 11:37:20 +0000
+++ templates/icehouse/nova.conf	2014-11-04 18:12:57 +0000
@@ -38,6 +38,10 @@
 
 use_syslog={{ use_syslog }}
 
+{% if memcached_servers %}
+memcached_servers = {%for s in memcached_servers %}{% if loop.index0 != 0 %},{% endif %}{{s['private-address']}}:{{s['port']}}{% endfor %}
+{% endif %}
+
 {% if keystone_ec2_url -%}
 keystone_ec2_url = {{ keystone_ec2_url }}
 {% endif -%}

=== added file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_nova_cc_contexts.py	2014-11-04 18:12:57 +0000
@@ -0,0 +1,56 @@
+from __future__ import print_function
+
+import mock
+import nova_cc_context as context
+
+from charmhelpers.contrib.openstack import utils
+
+from test_utils import CharmTestCase
+
+
+TO_PATCH = [
+    'apt_install',
+    'filter_installed_packages',
+    'relation_ids',
+    'relation_get',
+    'related_units',
+    'log',
+    'unit_get',
+    'relations_for_id',
+]
+
+
+def fake_log(msg, level=None):
+    level = level or 'INFO'
+    print('[juju test log (%s)] %s' % (level, msg))
+
+
+class NovaComputeContextTests(CharmTestCase):
+    def setUp(self):
+        super(NovaComputeContextTests, self).setUp(context, TO_PATCH)
+        self.relation_get.side_effect = self.test_relation.get
+        self.log.side_effect = fake_log
+
+    @mock.patch.object(utils, 'os_release')
+    def test_instance_console_context_without_memcache(self, os_release):
+        self.unit_get.return_value = '127.0.0.1'
+        self.relation_ids.return_value = 'cache:0'
+        self.related_units.return_value = 'memcached/0'
+        instance_console = context.InstanceConsoleContext()
+        os_release.return_value = 'icehouse'
+        self.assertEqual({'memcached_servers': []},
+                         instance_console())
+
+    @mock.patch.object(utils, 'os_release')
+    def test_instance_console_context_with_memcache(self, os_release):
+        memcached_servers = [{'private-address': '127.0.1.1',
+                              'port': '11211'}]
+        self.unit_get.return_value = '127.0.0.1'
+        self.relation_ids.return_value = ['cache:0']
+        self.relations_for_id.return_value = memcached_servers
+        self.related_units.return_value = 'memcached/0'
+        instance_console = context.InstanceConsoleContext()
+        os_release.return_value = 'icehouse'
+        self.maxDiff = None
+        self.assertEqual({'memcached_servers': memcached_servers},
+                         instance_console())

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2014-10-23 16:39:43 +0000
+++ unit_tests/test_nova_cc_utils.py	2014-11-04 18:12:57 +0000
@@ -155,8 +155,9 @@
             _map = utils.resource_map()
             return _map
 
+    @patch('charmhelpers.core.hookenv.config')
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_resource_map_quantum(self, subcontext):
+    def test_resource_map_quantum(self, subcontext, config_):
         self.is_relation_made.return_value = False
         self._resource_map(network_manager='quantum')
         _map = utils.resource_map()
@@ -167,8 +168,9 @@
         ]
         [self.assertIn(q_conf, _map.keys()) for q_conf in confs]
 
+    @patch('charmhelpers.core.hookenv.config')
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_resource_map_neutron(self, subcontext):
+    def test_resource_map_neutron(self, subcontext, config_):
         self.is_relation_made.return_value = False
         self._resource_map(network_manager='neutron')
         _map = utils.resource_map()
@@ -259,9 +261,11 @@
         for service in console_services:
             self.assertIn(service, _map['/etc/nova/nova.conf']['services'])
 
+    @patch('charmhelpers.core.hookenv.config')
     @patch('os.path.exists')
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_restart_map_api_before_frontends(self, subcontext, _exists):
+    def test_restart_map_api_before_frontends(self, subcontext, _exists,
+                                              config_):
         self.is_relation_made.return_value = False
         _exists.return_value = False
         self._resource_map(network_manager='neutron')
@@ -303,8 +307,9 @@
         pkgs = utils.determine_packages()
         self.assertIn('quantum-server', pkgs)
 
+    @patch('charmhelpers.core.hookenv.config')
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
-    def test_determine_packages_neutron(self, subcontext):
+    def test_determine_packages_neutron(self, subcontext, config_):
         self.is_relation_made.return_value = False
         self._resource_map(network_manager='neutron')
         pkgs = utils.determine_packages()