Merge lp:~hopem/charm-helpers/lp1499643 into lp:charm-helpers

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Approve

review: Approve

=== modified file 'charmhelpers/contrib/openstack/utils.py'
--- charmhelpers/contrib/openstack/utils.py	2015-09-16 14:53:33 +0000
+++ charmhelpers/contrib/openstack/utils.py	2015-09-25 14:25:06 +0000
@@ -54,7 +54,8 @@
 )
 
 from charmhelpers.contrib.network.ip import (
-    get_ipv6_addr
+    get_ipv6_addr,
+    is_ipv6,
 )
 
 from charmhelpers.contrib.python.packages import (
@@ -519,6 +520,12 @@
                                       relation_prefix=None):
     hosts = get_ipv6_addr(dynamic_only=False)
 
+    if config('vip'):
+        vips = config('vip').split()
+        for vip in vips:
+            if vip and is_ipv6(vip):
+                hosts.append(vip)
+
     kwargs = {'database': database,
               'username': database_user,
               'hostname': json.dumps(hosts)}

=== modified file 'tests/contrib/openstack/test_os_utils.py'
--- tests/contrib/openstack/test_os_utils.py	2014-09-30 10:16:32 +0000
+++ tests/contrib/openstack/test_os_utils.py	2015-09-25 14:25:06 +0000
@@ -9,12 +9,15 @@
     def setUp(self):
         super(UtilsTests, self).setUp()
 
+    @mock.patch.object(utils, 'config')
     @mock.patch('charmhelpers.contrib.openstack.utils.relation_set')
     @mock.patch('charmhelpers.contrib.openstack.utils.relation_ids')
     @mock.patch('charmhelpers.contrib.openstack.utils.get_ipv6_addr')
     def test_sync_db_with_multi_ipv6_addresses(self, mock_get_ipv6_addr,
                                                mock_relation_ids,
-                                               mock_relation_set):
+                                               mock_relation_set,
+                                               mock_config):
+        mock_config.return_value = None
         addr1 = '2001:db8:1:0:f816:3eff:fe45:7c/64'
         addr2 = '2001:db8:1:0:d0cf:528c:23eb:5000/64'
         mock_get_ipv6_addr.return_value = [addr1, addr2]
@@ -27,12 +30,15 @@
                                              username='testdbuser',
                                              hostname=hosts)
 
+    @mock.patch.object(utils, 'config')
     @mock.patch('charmhelpers.contrib.openstack.utils.relation_set')
     @mock.patch('charmhelpers.contrib.openstack.utils.relation_ids')
     @mock.patch('charmhelpers.contrib.openstack.utils.get_ipv6_addr')
     def test_sync_db_with_multi_ipv6_addresses_single(self, mock_get_ipv6_addr,
                                                       mock_relation_ids,
-                                                      mock_relation_set):
+                                                      mock_relation_set,
+                                                      mock_config):
+        mock_config.return_value = None
         addr1 = '2001:db8:1:0:f816:3eff:fe45:7c/64'
         mock_get_ipv6_addr.return_value = [addr1]
         mock_relation_ids.return_value = ['shared-db']
@@ -44,13 +50,16 @@
                                              username='testdbuser',
                                              hostname=hosts)
 
+    @mock.patch.object(utils, 'config')
     @mock.patch('charmhelpers.contrib.openstack.utils.relation_set')
     @mock.patch('charmhelpers.contrib.openstack.utils.relation_ids')
     @mock.patch('charmhelpers.contrib.openstack.utils.get_ipv6_addr')
     def test_sync_db_with_multi_ipv6_addresses_w_prefix(self,
                                                         mock_get_ipv6_addr,
                                                         mock_relation_ids,
-                                                        mock_relation_set):
+                                                        mock_relation_set,
+                                                        mock_config):
+        mock_config.return_value = None
         addr1 = '2001:db8:1:0:f816:3eff:fe45:7c/64'
         mock_get_ipv6_addr.return_value = [addr1]
         mock_relation_ids.return_value = ['shared-db']
@@ -62,3 +71,27 @@
                                              bungabunga_database='testdb',
                                              bungabunga_username='testdbuser',
                                              bungabunga_hostname=hosts)
+
+    @mock.patch.object(utils, 'config')
+    @mock.patch('charmhelpers.contrib.openstack.utils.relation_set')
+    @mock.patch('charmhelpers.contrib.openstack.utils.relation_ids')
+    @mock.patch('charmhelpers.contrib.openstack.utils.get_ipv6_addr')
+    def test_sync_db_with_multi_ipv6_addresses_vips(self, mock_get_ipv6_addr,
+                                                    mock_relation_ids,
+                                                    mock_relation_set,
+                                                    mock_config):
+        addr1 = '2001:db8:1:0:f816:3eff:fe45:7c/64'
+        addr2 = '2001:db8:1:0:d0cf:528c:23eb:5000/64'
+        vip1 = '2001:db8:1:0:f816:3eff:32b3:7c'
+        vip2 = '2001:db8:1:0:f816:3eff:32b3:7d'
+        mock_config.return_value = '%s 10.0.0.1 %s' % (vip1, vip2)
+
+        mock_get_ipv6_addr.return_value = [addr1, addr2]
+        mock_relation_ids.return_value = ['shared-db']
+
+        utils.sync_db_with_multi_ipv6_addresses('testdb', 'testdbuser')
+        hosts = json.dumps([addr1, addr2, vip1, vip2])
+        mock_relation_set.assert_called_with(relation_id='shared-db',
+                                             database='testdb',
+                                             username='testdbuser',
+                                             hostname=hosts)