Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/neutron-refactor into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

[Liam Young (gnuoy)]

Merge to add support for splitting neutron api to seperate principle charm

[James Page (james-page)]

review: Needs Fixing

[lp:~gnuoy/charms/trusty/nova-cloud-controller/neutron-refactor]

83. By Liam Young on 2014-06-23

Updated with fixes suggested from mp

84. By Liam Young on 2014-06-23

Fixed lint and unit tests

85. By Liam Young on 2014-06-23

Bug fix. Charm was looking for the wrong key in api relations s/_/-/

[Liam Young (gnuoy)]

Updated branch with updates suggested to mp

review: Needs Resubmitting

=== modified file 'README.txt'
--- README.txt	2014-03-25 09:11:04 +0000
+++ README.txt	2014-06-23 12:22:41 +0000
@@ -4,6 +4,11 @@
 
 Cloud controller node for Openstack nova. Contains nova-schedule, nova-api, nova-network and nova-objectstore.
 
+The neutron-api interface can be used join this charm with an external neutron-api server. If this is done
+then this charm will shutdown its neutron-api service and the external charm will be registered as the
+neutron-api endpoint in keystone. It will also use the quantum-security-groups setting which is passed to
+it by the api service rather than its own quantum-security-groups setting.
+
 ******************************************************
 Special considerations to be deployed using Postgresql
 ******************************************************

=== added symlink 'hooks/neutron-api-relation-broken'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/neutron-api-relation-changed'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/neutron-api-relation-departed'
=== target is u'nova_cc_hooks.py'
=== added symlink 'hooks/neutron-api-relation-joined'
=== target is u'nova_cc_hooks.py'
=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2014-05-03 06:48:39 +0000
+++ hooks/nova_cc_context.py	2014-06-23 12:22:41 +0000
@@ -1,7 +1,7 @@
 
 from charmhelpers.core.hookenv import (
     config, relation_ids, relation_set, log, ERROR,
-    unit_get)
+    unit_get, related_units, relation_get)
 
 from charmhelpers.fetch import apt_install, filter_installed_packages
 from charmhelpers.contrib.openstack import context, neutron, utils
@@ -14,6 +14,17 @@
 )
 
 
+def context_complete(ctxt):
+    _missing = []
+    for k, v in ctxt.iteritems():
+        if v is None or v == '':
+            _missing.append(k)
+    if _missing:
+        log('Missing required data: %s' % ' '.join(_missing), level='INFO')
+        return False
+    return True
+
+
 class ApacheSSLContext(context.ApacheSSLContext):
 
     interfaces = ['https']
@@ -27,6 +38,25 @@
         return super(ApacheSSLContext, self).__call__()
 
 
+class NeutronAPIContext(context.OSContextGenerator):
+    def __call__(self):
+        log('Generating template context from neutron api relation')
+        ctxt = {}
+        for rid in relation_ids('neutron-api'):
+            for unit in related_units(rid):
+                rdata = relation_get(rid=rid, unit=unit)
+                ctxt = {
+                    'neutron_url': rdata.get('neutron-url'),
+                    'neutron_plugin': rdata.get('neutron-plugin'),
+                    'neutron_security_groups':
+                    rdata.get('neutron-security-groups'),
+                    'network_manager': 'neutron',
+                }
+                if context_complete(ctxt):
+                    return ctxt
+        return {}
+
+
 class VolumeServiceContext(context.OSContextGenerator):
     interfaces = []
 

=== modified file 'hooks/nova_cc_hooks.py'
--- hooks/nova_cc_hooks.py	2014-04-11 16:41:42 +0000
+++ hooks/nova_cc_hooks.py	2014-06-23 12:22:41 +0000
@@ -24,7 +24,9 @@
 )
 
 from charmhelpers.core.host import (
-    restart_on_change
+    restart_on_change,
+    service_running,
+    service_stop,
 )
 
 from charmhelpers.fetch import (
@@ -41,6 +43,10 @@
     neutron_plugin_attribute,
 )
 
+from nova_cc_context import (
+    NeutronAPIContext
+    )
+
 from nova_cc_utils import (
     api_port,
     auth_token_config,
@@ -120,10 +126,11 @@
         log('amqp relation incomplete. Peer not ready?')
         return
     CONFIGS.write(NOVA_CONF)
-    if network_manager() == 'quantum':
-        CONFIGS.write(QUANTUM_CONF)
-    if network_manager() == 'neutron':
-        CONFIGS.write(NEUTRON_CONF)
+    if not is_relation_made('neutron-api'):
+        if network_manager() == 'quantum':
+            CONFIGS.write(QUANTUM_CONF)
+        if network_manager() == 'neutron':
+            CONFIGS.write(NEUTRON_CONF)
 
 
 @hooks.hook('shared-db-relation-joined')
@@ -235,12 +242,13 @@
         return
     CONFIGS.write('/etc/nova/api-paste.ini')
     CONFIGS.write(NOVA_CONF)
-    if network_manager() == 'quantum':
-        CONFIGS.write(QUANTUM_API_PASTE)
-        CONFIGS.write(QUANTUM_CONF)
-        save_novarc()
-    if network_manager() == 'neutron':
-        CONFIGS.write(NEUTRON_CONF)
+    if not is_relation_made('neutron-api'):
+        if network_manager() == 'quantum':
+            CONFIGS.write(QUANTUM_API_PASTE)
+            CONFIGS.write(QUANTUM_CONF)
+            save_novarc()
+        if network_manager() == 'neutron':
+            CONFIGS.write(NEUTRON_CONF)
     [compute_joined(rid) for rid in relation_ids('cloud-compute')]
     [quantum_joined(rid) for rid in relation_ids('quantum-network-service')]
     [nova_vmware_relation_joined(rid) for rid in relation_ids('nova-vmware')]
@@ -293,6 +301,34 @@
         out.write('export OS_REGION_NAME=%s\n' % config('region'))
 
 
+def neutron_settings():
+    neutron_settings = {}
+    if is_relation_made('neutron-api', 'neutron-plugin'):
+        neutron_api_info = NeutronAPIContext()
+        neutron_settings.update({
+            # XXX: Rename these relations settings?
+            'quantum_plugin': neutron_api_info()['neutron_plugin'],
+            'region': config('region'),
+            'quantum_security_groups':
+            neutron_api_info()['neutron_security_groups'],
+            'quantum_url': neutron_api_info()['neutron_url'],
+        })
+    else:
+        neutron_settings.update({
+            # XXX: Rename these relations settings?
+            'quantum_plugin': neutron_plugin(),
+            'region': config('region'),
+            'quantum_security_groups': config('quantum-security-groups'),
+            'quantum_url': (canonical_url(CONFIGS) + ':' +
+                            str(api_port('neutron-server'))),
+        })
+    neutron_settings['quantum_host'] = \
+        urlparse(neutron_settings['quantum_url']).hostname
+    neutron_settings['quantum_port'] = \
+        urlparse(neutron_settings['quantum_url']).port
+    return neutron_settings
+
+
 def keystone_compute_settings():
     ks_auth_config = _auth_config()
     rel_settings = {}
@@ -300,20 +336,10 @@
     if network_manager() in ['quantum', 'neutron']:
         if ks_auth_config:
             rel_settings.update(ks_auth_config)
-
-        rel_settings.update({
-            # XXX: Rename these relations settings?
-            'quantum_plugin': neutron_plugin(),
-            'region': config('region'),
-            'quantum_security_groups': config('quantum-security-groups'),
-            'quantum_url': (canonical_url(CONFIGS) + ':' +
-                            str(api_port('neutron-server'))),
-        })
-
+        rel_settings.update(neutron_settings())
     ks_ca = keystone_ca_cert_b64()
     if ks_auth_config and ks_ca:
         rel_settings['ca_cert'] = ks_ca
-
     return rel_settings
 
 
@@ -328,7 +354,6 @@
         # this may not even be needed.
         'ec2_host': unit_get('private-address'),
     }
-
     # update relation setting if we're attempting to restart remote
     # services
     if remote_restart:
@@ -367,15 +392,7 @@
     if not eligible_leader(CLUSTER_RES):
         return
 
-    url = canonical_url(CONFIGS) + ':9696'
-    # XXX: Can we rename to neutron_*?
-    rel_settings = {
-        'quantum_host': urlparse(url).hostname,
-        'quantum_url': url,
-        'quantum_port': 9696,
-        'quantum_plugin': neutron_plugin(),
-        'region': config('region')
-    }
+    rel_settings = neutron_settings()
 
     # inform quantum about local keystone auth config
     ks_auth_config = _auth_config()
@@ -385,7 +402,6 @@
     ks_ca = keystone_ca_cert_b64()
     if ks_auth_config and ks_ca:
         rel_settings['ca_cert'] = ks_ca
-
     relation_set(relation_id=rid, **rel_settings)
 
 
@@ -500,6 +516,42 @@
         identity_joined(rid=r_id)
 
 
[e-mail]('neutron-api-relation-joined')
+def neutron_api_relation_joined(rid=None):
+    with open('/etc/init/neutron-server.override', 'wb') as out:
+        out.write('manual\n')
+    if os.path.isfile(NEUTRON_CONF):
+        os.rename(NEUTRON_CONF, NEUTRON_CONF + '_unused')
+    if service_running('neutron-server'):
+        service_stop('neutron-server')
+    for id_rid in relation_ids('identity-service'):
+        identity_joined(rid=id_rid)
+    nova_url = canonical_url(CONFIGS) + ":8774/v2"
+    relation_set(relation_id=rid, nova_url=nova_url)
+
+
[e-mail]('neutron-api-relation-changed')
+@restart_on_change(restart_map())
+def neutron_api_relation_changed():
+    CONFIGS.write(NOVA_CONF)
+    for rid in relation_ids('cloud-compute'):
+        compute_joined(rid=rid)
+    for rid in relation_ids('quantum-network-service'):
+        quantum_joined(rid=rid)
+
+
[e-mail]('neutron-api-relation-broken')
+@restart_on_change(restart_map())
+def neutron_api_relation_broken():
+    if os.path.isfile('/etc/init/neutron-server.override'):
+        os.remove('/etc/init/neutron-server.override')
+    CONFIGS.write_all()
+    for rid in relation_ids('cloud-compute'):
+        compute_joined(rid=rid)
+    for rid in relation_ids('quantum-network-service'):
+        quantum_joined(rid=rid)
+
+
 def main():
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/nova_cc_utils.py'
--- hooks/nova_cc_utils.py	2014-06-12 09:46:56 +0000
+++ hooks/nova_cc_utils.py	2014-06-23 12:22:41 +0000
@@ -33,12 +33,13 @@
     relation_get,
     relation_ids,
     remote_unit,
+    is_relation_made,
     INFO,
     ERROR,
 )
 
 from charmhelpers.core.host import (
-    service_start
+    service_start,
 )
 
 
@@ -106,8 +107,7 @@
                      context.SyslogContext(),
                      nova_cc_context.HAProxyContext(),
                      nova_cc_context.IdentityServiceContext(),
-                     nova_cc_context.VolumeServiceContext(),
-                     nova_cc_context.NeutronCCContext()],
+                     nova_cc_context.VolumeServiceContext()],
     }),
     (NOVA_API_PASTE, {
         'services': [s for s in BASE_SERVICES if 'api' in s],
@@ -188,39 +188,47 @@
 
     net_manager = network_manager()
 
-    # pop out irrelevant resources from the OrderedDict (easier than adding
-    # them late)
-    if net_manager != 'quantum':
-        [resource_map.pop(k) for k in list(resource_map.iterkeys())
-         if 'quantum' in k]
-    if net_manager != 'neutron':
-        [resource_map.pop(k) for k in list(resource_map.iterkeys())
-         if 'neutron' in k]
-
     if os.path.exists('/etc/apache2/conf-available'):
         resource_map.pop(APACHE_CONF)
     else:
         resource_map.pop(APACHE_24_CONF)
 
-    # add neutron plugin requirements. nova-c-c only needs the neutron-server
-    # associated with configs, not the plugin agent.
-    if net_manager in ['quantum', 'neutron']:
-        plugin = neutron_plugin()
-        if plugin:
-            conf = neutron_plugin_attribute(plugin, 'config', net_manager)
-            ctxts = (neutron_plugin_attribute(plugin, 'contexts', net_manager)
-                     or [])
-            services = neutron_plugin_attribute(plugin, 'server_services',
-                                                net_manager)
-            resource_map[conf] = {}
-            resource_map[conf]['services'] = services
-            resource_map[conf]['contexts'] = ctxts
-            resource_map[conf]['contexts'].append(
-                nova_cc_context.NeutronCCContext())
+    if is_relation_made('neutron-api'):
+        [resource_map.pop(k) for k in list(resource_map.iterkeys())
+         if 'quantum' in k or 'neutron' in k]
+        resource_map[NOVA_CONF]['contexts'].append(
+            nova_cc_context.NeutronAPIContext())
+    else:
+        resource_map[NOVA_CONF]['contexts'].append(
+            nova_cc_context.NeutronCCContext())
+        # pop out irrelevant resources from the OrderedDict (easier than adding
+        # them late)
+        if net_manager != 'quantum':
+            [resource_map.pop(k) for k in list(resource_map.iterkeys())
+             if 'quantum' in k]
+        if net_manager != 'neutron':
+            [resource_map.pop(k) for k in list(resource_map.iterkeys())
+             if 'neutron' in k]
+        # add neutron plugin requirements. nova-c-c only needs the
+        # neutron-server associated with configs, not the plugin agent.
+        if net_manager in ['quantum', 'neutron']:
+            plugin = neutron_plugin()
+            if plugin:
+                conf = neutron_plugin_attribute(plugin, 'config', net_manager)
+                ctxts = (neutron_plugin_attribute(plugin, 'contexts',
+                                                  net_manager)
+                         or [])
+                services = neutron_plugin_attribute(plugin, 'server_services',
+                                                    net_manager)
+                resource_map[conf] = {}
+                resource_map[conf]['services'] = services
+                resource_map[conf]['contexts'] = ctxts
+                resource_map[conf]['contexts'].append(
+                    nova_cc_context.NeutronCCContext())
 
-            # update for postgres
-            resource_map[conf]['contexts'].append(
-                nova_cc_context.NeutronPostgresqlDBContext())
+                # update for postgres
+                resource_map[conf]['contexts'].append(
+                    nova_cc_context.NeutronPostgresqlDBContext())
 
     # nova-conductor for releases >= G.
     if os_release('nova-common') not in ['essex', 'folsom']:
@@ -235,6 +243,7 @@
         for s in vmware_ctxt['services']:
             if s not in resource_map[NOVA_CONF]['services']:
                 resource_map[NOVA_CONF]['services'].append(s)
+
     return resource_map
 
 
@@ -681,7 +690,15 @@
         })
 
     # XXX: Keep these relations named quantum_*??
-    if network_manager() in ['quantum', 'neutron']:
+    if is_relation_made('neutron-api'):
+        endpoints.update({
+            'quantum_service': None,
+            'quantum_region': None,
+            'quantum_public_url': None,
+            'quantum_admin_url': None,
+            'quantum_internal_url': None,
+        })
+    elif network_manager() in ['quantum', 'neutron']:
         endpoints.update({
             'quantum_service': 'quantum',
             'quantum_region': region,

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-03-31 11:56:09 +0000
+++ metadata.yaml	2014-06-23 12:22:41 +0000
@@ -30,6 +30,8 @@
     interface: nova-volume
   quantum-network-service:
     interface: quantum
+  neutron-api:
+    interface: neutron-api
   ha:
     interface: hacluster
     scope: container

=== modified file 'revision'
--- revision	2014-04-16 08:25:14 +0000
+++ revision	2014-06-23 12:22:41 +0000
@@ -1,1 +1,1 @@
-315
+500

=== modified file 'unit_tests/test_nova_cc_hooks.py'
--- unit_tests/test_nova_cc_hooks.py	2014-05-21 10:03:01 +0000
+++ unit_tests/test_nova_cc_hooks.py	2014-06-23 12:22:41 +0000
@@ -1,6 +1,6 @@
 from mock import MagicMock, patch
-from test_utils import CharmTestCase
-
+from test_utils import CharmTestCase, patch_open
+import os
 with patch('charmhelpers.core.hookenv.config') as config:
     config.return_value = 'neutron'
     import nova_cc_utils as utils
@@ -38,6 +38,8 @@
     'ssh_known_hosts_b64',
     'ssh_authorized_keys_b64',
     'save_script_rc',
+    'service_running',
+    'service_stop',
     'execd_preinstall',
     'network_manager',
     'volume_service',
@@ -105,8 +107,10 @@
         self.relation_set.assert_called_with(known_hosts='hosts',
                                              authorized_keys='keys')
 
+#    @patch.object(hooks, 'NeutronAPIContext')
     @patch.object(hooks, '_auth_config')
     def test_compute_joined_neutron(self, auth_config):
+        self.is_relation_made.return_value = False
         self.network_manager.return_value = 'neutron'
         self.eligible_leader = True
         self.keystone_ca_cert_b64.return_value = 'foocert64'
@@ -122,6 +126,8 @@
             relation_id=None,
             quantum_url='http://nova-cc-host1:9696',
             ca_cert='foocert64',
+            quantum_port=9696,
+            quantum_host='nova-cc-host1',
             quantum_security_groups='no',
             region='RegionOne',
             volume_service='cinder',
@@ -129,6 +135,40 @@
             quantum_plugin='nvp',
             network_manager='neutron', **FAKE_KS_AUTH_CFG)
 
+    @patch.object(hooks, 'NeutronAPIContext')
+    @patch.object(hooks, '_auth_config')
+    def test_compute_joined_neutron_api_rel(self, auth_config, napi):
+        def mock_NeutronAPIContext():
+            return {
+                'neutron_plugin': 'bob',
+                'neutron_security_groups': 'yes',
+                'neutron_url': 'http://nova-cc-host1:9696',
+            }
+        napi.return_value = mock_NeutronAPIContext
+        self.is_relation_made.return_value = True
+        self.network_manager.return_value = 'neutron'
+        self.eligible_leader = True
+        self.keystone_ca_cert_b64.return_value = 'foocert64'
+        self.volume_service.return_value = 'cinder'
+        self.unit_get.return_value = 'nova-cc-host1'
+        self.canonical_url.return_value = 'http://nova-cc-host1'
+        self.api_port.return_value = '9696'
+        self.neutron_plugin.return_value = 'nvp'
+        auth_config.return_value = FAKE_KS_AUTH_CFG
+        hooks.compute_joined()
+        self.relation_set.assert_called_with(
+            relation_id=None,
+            quantum_url='http://nova-cc-host1:9696',
+            ca_cert='foocert64',
+            quantum_port=9696,
+            quantum_host='nova-cc-host1',
+            quantum_security_groups='yes',
+            region='RegionOne',
+            volume_service='cinder',
+            ec2_host='nova-cc-host1',
+            quantum_plugin='bob',
+            network_manager='neutron', **FAKE_KS_AUTH_CFG)
+
     @patch.object(hooks, '_auth_config')
     def test_nova_vmware_joined(self, auth_config):
         auth_config.return_value = FAKE_KS_AUTH_CFG
@@ -231,3 +271,46 @@
         self._postgresql_db_test(configs)
         self.assertTrue(configs.write_all.called)
         self.migrate_database.assert_called_with()
+
+    @patch.object(os, 'rename')
+    @patch.object(os.path, 'isfile')
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_api_relation_joined(self, configs, isfile, rename):
+        neutron_conf = '/etc/neutron/neutron.conf'
+        nova_url = 'http://novaurl:8774/v2'
+        isfile.return_value = True
+        self.service_running.return_value = True
+        _identity_joined = self.patch('identity_joined')
+        self.relation_ids.side_effect = ['relid']
+        self.canonical_url.return_value = 'http://novaurl'
+        with patch_open() as (_open, _file):
+            hooks.neutron_api_relation_joined()
+            self.service_stop.assert_called_with('neutron-server')
+            rename.assert_called_with(neutron_conf, neutron_conf + '_unused')
+            self.assertTrue(_identity_joined.called)
+            self.relation_set.assert_called_with(relation_id=None,
+                                                 nova_url=nova_url)
+
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_api_relation_changed(self, configs):
+        self.relation_ids.return_value = ['relid']
+        _compute_joined = self.patch('compute_joined')
+        _quantum_joined = self.patch('quantum_joined')
+        hooks.neutron_api_relation_changed()
+        self.assertTrue(configs.write.called_with('/etc/nova/nova.conf'))
+        self.assertTrue(_compute_joined.called)
+        self.assertTrue(_quantum_joined.called)
+
+    @patch.object(os, 'remove')
+    @patch.object(os.path, 'isfile')
+    @patch.object(hooks, 'CONFIGS')
+    def test_neutron_api_relation_broken(self, configs, isfile, remove):
+        isfile.return_value = True
+        self.relation_ids.return_value = ['relid']
+        _compute_joined = self.patch('compute_joined')
+        _quantum_joined = self.patch('quantum_joined')
+        hooks.neutron_api_relation_broken()
+        remove.assert_called_with('/etc/init/neutron-server.override')
+        self.assertTrue(configs.write_all.called)
+        self.assertTrue(_compute_joined.called)
+        self.assertTrue(_quantum_joined.called)

=== modified file 'unit_tests/test_nova_cc_utils.py'
--- unit_tests/test_nova_cc_utils.py	2014-05-02 10:06:23 +0000
+++ unit_tests/test_nova_cc_utils.py	2014-06-23 12:22:41 +0000
@@ -22,6 +22,7 @@
     'eligible_leader',
     'enable_policy_rcd',
     'get_os_codename_install_source',
+    'is_relation_made',
     'log',
     'ml2_migration',
     'network_manager',
@@ -151,6 +152,7 @@
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_resource_map_quantum(self, subcontext):
+        self.is_relation_made.return_value = False
         self._resource_map(network_manager='quantum')
         _map = utils.resource_map()
         confs = [
@@ -162,6 +164,7 @@
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_resource_map_neutron(self, subcontext):
+        self.is_relation_made.return_value = False
         self._resource_map(network_manager='neutron')
         _map = utils.resource_map()
         confs = [
@@ -170,6 +173,17 @@
         [self.assertIn(q_conf, _map.keys()) for q_conf in confs]
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
+    def test_resource_map_neutron_api_rel(self, subcontext):
+        self.is_relation_made.return_value = True
+        self._resource_map(network_manager='neutron')
+        _map = utils.resource_map()
+        confs = [
+            '/etc/neutron/neutron.conf',
+        ]
+        for q_conf in confs:
+            self.assertFalse(q_conf in _map.keys())
+
+    @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_resource_map_vmware(self, subcontext):
         fake_context = MagicMock()
         fake_context.return_value = {
@@ -201,6 +215,7 @@
     @patch('os.path.exists')
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_restart_map_api_before_frontends(self, subcontext, _exists):
+        self.is_relation_made.return_value = False
         _exists.return_value = False
         self._resource_map(network_manager='neutron')
         _map = utils.restart_map()
@@ -226,6 +241,7 @@
 
     @patch('charmhelpers.contrib.openstack.context.SubordinateConfigContext')
     def test_determine_packages_neutron(self, subcontext):
+        self.is_relation_made.return_value = False
         self._resource_map(network_manager='neutron')
         pkgs = utils.determine_packages()
         self.assertIn('neutron-server', pkgs)
@@ -421,11 +437,13 @@
         self.os_release.return_value = 'folsom'
 
     def test_determine_endpoints_base(self):
+        self.is_relation_made.return_value = False
         self.relation_ids.return_value = []
         self.assertEquals(
             BASE_ENDPOINTS, utils.determine_endpoints('http://foohost.com'))
 
     def test_determine_endpoints_nova_volume(self):
+        self.is_relation_made.return_value = False
         self.relation_ids.return_value = ['nova-volume-service/0']
         endpoints = deepcopy(BASE_ENDPOINTS)
         endpoints.update({
@@ -441,6 +459,7 @@
             endpoints, utils.determine_endpoints('http://foohost.com'))
 
     def test_determine_endpoints_quantum_neutron(self):
+        self.is_relation_made.return_value = False
         self.relation_ids.return_value = []
         self.network_manager.return_value = 'quantum'
         endpoints = deepcopy(BASE_ENDPOINTS)
@@ -453,6 +472,20 @@
         self.assertEquals(
             endpoints, utils.determine_endpoints('http://foohost.com'))
 
+    def test_determine_endpoints_neutron_api_rel(self):
+        self.is_relation_made.return_value = True
+        self.relation_ids.return_value = []
+        self.network_manager.return_value = 'quantum'
+        endpoints = deepcopy(BASE_ENDPOINTS)
+        endpoints.update({
+            'quantum_admin_url': None,
+            'quantum_internal_url': None,
+            'quantum_public_url': None,
+            'quantum_region': None,
+            'quantum_service': None})
+        self.assertEquals(
+            endpoints, utils.determine_endpoints('http://foohost.com'))
+
     @patch.object(utils, 'known_hosts')
     @patch('subprocess.check_output')
     def test_ssh_known_host_key(self, _check_output, _known_hosts):