Merge lp:~hopem/charms/trusty/nova-compute/lp1499656 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/next

[Edward Hope-Morley]

[lp:~hopem/charms/trusty/nova-compute/lp1499656]

163. By Edward Hope-Morley on 2015-09-28

add u/t

[Billy Olsen (billy-olsen)]

Approved.

review: Approve

=== modified file 'hooks/nova_compute_context.py'
--- hooks/nova_compute_context.py	2015-09-28 07:56:16 +0000
+++ hooks/nova_compute_context.py	2015-09-28 17:33:10 +0000
@@ -26,7 +26,6 @@
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
     get_ipv6_addr,
-    format_ipv6_addr,
 )
 
 # This is just a label and it must be consistent across
@@ -493,6 +492,7 @@
             host_ip = get_host_ip(unit_get('private-address'))
 
         if host_ip:
-            ctxt['host_ip'] = format_ipv6_addr(host_ip) or host_ip
+            # NOTE: do not format this even for ipv6 (see bug 1499656)
+            ctxt['host_ip'] = host_ip
 
         return ctxt

=== modified file 'unit_tests/test_nova_compute_contexts.py'
--- unit_tests/test_nova_compute_contexts.py	2015-03-31 08:46:52 +0000
+++ unit_tests/test_nova_compute_contexts.py	2015-09-28 17:33:10 +0000
@@ -230,10 +230,19 @@
         self.log = fake_log
         self.unit_get.return_value = '172.24.0.79'
         host_ip = context.HostIPContext()
-        self.assertEquals(
-            {'host_ip': '172.24.0.79'}, host_ip())
+        self.assertEquals({'host_ip': '172.24.0.79'}, host_ip())
         self.unit_get.assert_called_with('private-address')
 
+    @patch.object(context, 'get_ipv6_addr')
+    @patch('subprocess.call')
+    def test_host_IP_context_ipv6(self, _call, mock_get_ipv6_addr):
+        self.log = fake_log
+        self.test_config.set('prefer-ipv6', True)
+        mock_get_ipv6_addr.return_value = ['2001:db8:0:1::2']
+        host_ip = context.HostIPContext()
+        self.assertEquals({'host_ip': '2001:db8:0:1::2'}, host_ip())
+        self.assertTrue(mock_get_ipv6_addr.called)
+
     def test_metadata_service_ctxt(self):
         self.relation_ids.return_value = 'neutron-plugin:0'
         self.related_units.return_value = 'neutron-openvswitch/0'