Merge lp:~openstack-charmers/charms/trusty/nova-cloud-controller/fix-multi-vips into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Edward Hope-Morley]

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

charm_lint_check #854 nova-cloud-controller-next for hopem mp246926
    LINT OK: passed

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

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

charm_unit_test #883 nova-cloud-controller-next for hopem mp246926
    UNIT OK: passed

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

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

charm_amulet_test #1078 nova-cloud-controller-next for hopem mp246926
    AMULET OK: passed

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

[Ante Karamatić (ivoks)]

review: Needs Fixing

[lp:~openstack-charmers/charms/trusty/nova-cloud-controller/fix-multi-vips]

139. By Edward Hope-Morley on 2015-01-20

removed neutron api version, added more unit tests

Unmerged revisions

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2014-12-19 10:25:03 +0000
+++ hooks/nova_cc_context.py	2015-01-20 09:33:04 +0000
@@ -4,7 +4,6 @@
     relation_set,
     log,
     ERROR,
-    unit_get,
     related_units,
     relations_for_id,
     relation_get,
@@ -22,10 +21,9 @@
     determine_apache_port,
     determine_api_port,
     https,
-    is_clustered,
 )
 from charmhelpers.contrib.network.ip import (
-    get_ipv6_addr,
+    is_ipv6,
     format_ipv6_addr,
 )
 from charmhelpers.contrib.openstack.ip import (
@@ -196,30 +194,32 @@
         return ctxt
 
 
-def canonical_url(vip_setting='vip'):
-    '''
-    Returns the correct HTTP URL to this host given the state of HTTPS
+def canonical_url():
+    """Returns the correct HTTP URL to this host given the state of HTTPS
     configuration and hacluster.
-
-    :vip_setting:                str: Setting in charm config that specifies
-                                      VIP address.
-    '''
+    """
     scheme = 'http'
     if https():
         scheme = 'https'
 
-    if config('prefer-ipv6'):
-        if is_clustered():
-            addr = '[%s]' % config(vip_setting)
-        else:
-            addr = '[%s]' % get_ipv6_addr(exc_list=[config('vip')])[0]
-    else:
-        if is_clustered():
-            addr = config(vip_setting)
-        else:
-            addr = unit_get('private-address')
-
-    return '%s://%s' % (scheme, addr)
+    address = resolve_address(INTERNAL)
+    if is_ipv6(address):
+        address = "[{}]".format(address)
+
+    return '%s://%s' % (scheme, address)
+
+
+def use_local_neutron_api():
+    """If no neutron-api relation exists returns True.
+
+    If no neutron-api relation exists we assume that we are going to use
+    legacy-mode i.e. local neutron server.
+    """
+    for rid in relation_ids('neutron-api'):
+        for unit in related_units(rid):
+            return False
+
+    return True
 
 
 class NeutronCCContext(context.NeutronContext):
@@ -258,7 +258,10 @@
                     ','.join(_config['nvp-controllers'].split())
                 ctxt['nvp_controllers_list'] = \
                     _config['nvp-controllers'].split()
+
         ctxt['nova_url'] = "{}:8774/v2".format(canonical_url())
+        if use_local_neutron_api():
+            ctxt['neutron_url'] = "{}:9696".format(canonical_url())
 
         return ctxt
 
 
=== modified file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2014-12-16 14:08:58 +0000
+++ unit_tests/test_nova_cc_contexts.py	2015-01-20 09:33:04 +0000
@@ -30,8 +30,8 @@
     'related_units',
     'config',
     'log',
-    'unit_get',
     'relations_for_id',
+    'https',
 ]
 
 
@@ -50,7 +50,6 @@
     @mock.patch.object(utils, 'os_release')
     @mock.patch('charmhelpers.contrib.network.ip.log')
     def test_instance_console_context_without_memcache(self, os_release, log_):
-        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()
@@ -76,7 +75,6 @@
                                                      formated_ip):
         memcached_servers = [{'private-address': formated_ip,
                               'port': '11211'}]
-        self.unit_get.return_value = ip
         self.relation_ids.return_value = ['cache:0']
         self.relations_for_id.return_value = memcached_servers
         self.related_units.return_value = 'memcached/0'
@@ -85,3 +83,60 @@
         self.maxDiff = None
         self.assertEqual({'memcached_servers': "%s:11211" % (formated_ip, )},
                          instance_console())
+
+    @mock.patch.object(context, 'use_local_neutron_api')
+    @mock.patch('charmhelpers.contrib.openstack.ip.config')
+    @mock.patch('charmhelpers.contrib.openstack.ip.is_clustered')
+    def test_neutron_context_single_vip(self, mock_is_clustered, mock_config,
+                                        mock_use_local_neutron_api):
+        mock_use_local_neutron_api.return_value = True
+        self.https.return_value = False
+        mock_is_clustered.return_value = True
+        config = {'vip': '10.0.0.1',
+                  'os-internal-network': '10.0.0.1/24',
+                  'os-admin-network': '10.0.1.0/24',
+                  'os-public-network': '10.0.2.0/24'}
+        mock_config.side_effect = lambda key: config[key]
+
+        mock_use_local_neutron_api.return_value = False
+        ctxt = context.NeutronCCContext()()
+        self.assertEqual(ctxt['nova_url'], 'http://10.0.0.1:8774/v2')
+        self.assertFalse('neutron_url' in ctxt)
+
+        mock_use_local_neutron_api.return_value = True
+        ctxt = context.NeutronCCContext()()
+        self.assertEqual(ctxt['nova_url'], 'http://10.0.0.1:8774/v2')
+        self.assertEqual(ctxt['neutron_url'], 'http://10.0.0.1:9696')
+
+    @mock.patch.object(context, 'use_local_neutron_api')
+    @mock.patch('charmhelpers.contrib.openstack.ip.config')
+    @mock.patch('charmhelpers.contrib.openstack.ip.is_clustered')
+    def test_neutron_context_multi_vip(self, mock_is_clustered, mock_config,
+                                       mock_use_local_neutron_api):
+        self.https.return_value = False
+        mock_is_clustered.return_value = True
+        config = {'vip': '10.0.0.1 10.0.1.1 10.0.2.1',
+                  'os-internal-network': '10.0.1.0/24',
+                  'os-admin-network': '10.0.0.0/24',
+                  'os-public-network': '10.0.2.0/24'}
+        mock_config.side_effect = lambda key: config[key]
+
+        mock_use_local_neutron_api.return_value = False
+        ctxt = context.NeutronCCContext()()
+        self.assertEqual(ctxt['nova_url'], 'http://10.0.1.1:8774/v2')
+        self.assertFalse('neutron_url' in ctxt)
+
+        mock_use_local_neutron_api.return_value = True
+        ctxt = context.NeutronCCContext()()
+        self.assertEqual(ctxt['nova_url'], 'http://10.0.1.1:8774/v2')
+        self.assertEqual(ctxt['neutron_url'], 'http://10.0.1.1:9696')
+
+    def test_use_local_neutron_api(self):
+        self.relation_ids.return_value = []
+        self.related_units.return_value = []
+        self.assertTrue(context.use_local_neutron_api())
+        self.relation_ids.return_value = ['rel:0']
+        self.related_units.return_value = []
+        self.assertTrue(context.use_local_neutron_api())
+        self.related_units.return_value = ['unit/0']
+        self.assertFalse(context.use_local_neutron_api())