Merge lp:~gnuoy/charms/trusty/nova-cloud-controller/fix-haproxy-cfg-for-neutron-api-lp1476394 into lp:~openstack-charmers-archive/charms/trusty/nova-cloud-controller/next

[Liam Young]

[lp:~gnuoy/charms/trusty/nova-cloud-controller/fix-haproxy-cfg-for-neutron-api-lp1476394]

179. By Liam Young on 2015-09-28

Merged /next in

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

charm_lint_check #10890 nova-cloud-controller-next for gnuoy mp272555
    LINT OK: passed

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

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

charm_unit_test #10107 nova-cloud-controller-next for gnuoy mp272555
    UNIT OK: passed

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

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

charm_lint_check #10891 nova-cloud-controller-next for gnuoy mp272555
    LINT OK: passed

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

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

charm_unit_test #10108 nova-cloud-controller-next for gnuoy mp272555
    UNIT OK: passed

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

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

charm_amulet_test #6845 nova-cloud-controller-next for gnuoy mp272555
    AMULET OK: passed

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

[David Ames (thedac)]

This looks good.

review: Approve

=== modified file 'hooks/nova_cc_context.py'
--- hooks/nova_cc_context.py	2015-07-24 12:29:29 +0000
+++ hooks/nova_cc_context.py	2015-09-28 09:06:56 +0000
@@ -11,6 +11,7 @@
     related_units,
     relations_for_id,
     relation_get,
+    is_relation_made,
     unit_get,
 )
 from charmhelpers.fetch import (
@@ -185,13 +186,14 @@
             })
             listen_ports['osapi_volume_listen_port'] = nvol_api
 
-        if neutron.network_manager() in ['neutron', 'quantum']:
-            port_mapping.update({
-                'neutron-server': [
-                    api_port('neutron-server'), a_neutron_api]
-            })
-            # quantum/neutron.conf listening port, set separte from nova's.
-            ctxt['neutron_bind_port'] = neutron_api
+        if not is_relation_made('neutron-api'):
+            if neutron.network_manager() in ['neutron', 'quantum']:
+                port_mapping.update({
+                    'neutron-server': [
+                        api_port('neutron-server'), a_neutron_api]
+                })
+                # quantum/neutron.conf listening port, set separte from nova's.
+                ctxt['neutron_bind_port'] = neutron_api
 
         # for haproxy.conf
         ctxt['service_ports'] = port_mapping
 
=== modified file 'unit_tests/test_nova_cc_contexts.py'
--- unit_tests/test_nova_cc_contexts.py	2015-07-24 12:29:29 +0000
+++ unit_tests/test_nova_cc_contexts.py	2015-09-28 09:06:56 +0000
@@ -19,6 +19,7 @@
 
 from test_utils import CharmTestCase
 
+from charmhelpers.contrib.openstack import neutron
 
 TO_PATCH = [
     'apt_install',
@@ -30,6 +31,7 @@
     'log',
     'relations_for_id',
     'https',
+    'is_relation_made',
 ]
 
 
@@ -149,6 +151,45 @@
         self.related_units.return_value = ['unit/0']
         self.assertFalse(context.use_local_neutron_api())
 
+    @mock.patch.object(neutron, 'network_manager')
+    @mock.patch('charmhelpers.contrib.hahelpers.cluster.https')
+    @mock.patch('charmhelpers.contrib.openstack.context.'
+                'get_address_in_network')
+    @mock.patch('charmhelpers.contrib.openstack.context.'
+                'get_netmask_for_address')
+    @mock.patch('charmhelpers.contrib.openstack.context.local_unit')
+    @mock.patch('charmhelpers.contrib.openstack.context.get_ipv6_addr')
+    @mock.patch('charmhelpers.contrib.openstack.context.relation_ids')
+    def test_haproxy_context(self, mock_relation_ids, mock_get_ipv6_addr,
+                             mock_local_unit, mock_get_netmask_for_address,
+                             mock_get_address_in_network, mock_https,
+                             mock_network_manager):
+        mock_network_manager.return_value = 'neutron'
+        mock_https.return_value = False
+        self.is_relation_made.return_value = False
+        ctxt = context.HAProxyContext()()
+        self.assertEqual(ctxt['service_ports']['neutron-server'], [9696, 9686])
+
+    @mock.patch.object(neutron, 'network_manager')
+    @mock.patch('charmhelpers.contrib.hahelpers.cluster.https')
+    @mock.patch('charmhelpers.contrib.openstack.context.'
+                'get_address_in_network')
+    @mock.patch('charmhelpers.contrib.openstack.context.'
+                'get_netmask_for_address')
+    @mock.patch('charmhelpers.contrib.openstack.context.local_unit')
+    @mock.patch('charmhelpers.contrib.openstack.context.get_ipv6_addr')
+    @mock.patch('charmhelpers.contrib.openstack.context.relation_ids')
+    def test_haproxy_context_api_relation(self, mock_relation_ids,
+                                          mock_get_ipv6_addr, mock_local_unit,
+                                          mock_get_netmask_for_address,
+                                          mock_get_address_in_network,
+                                          mock_https, mock_network_manager):
+        mock_network_manager.return_value = 'neutron'
+        mock_https.return_value = False
+        self.is_relation_made.return_value = True
+        ctxt = context.HAProxyContext()()
+        self.assertEqual(ctxt['service_ports'].get('neutron-server'), None)
+
     @mock.patch.object(context, 'config')
     def test_console_ssl_disabled(self, mock_config):
         config = {'console-ssl-cert': 'LS0tLS1CRUdJTiBDRV',