Merge lp:~danilo/charms/trusty/percona-cluster/autodetect-vip-cidr into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Данило Шеган]

Make percona-cluster auto-detect vip_cidr and vip_iface like other charms

percona-cluster is currently behaving differently from other OpenStack charms: it does not attempt to auto-detect a VIP CIDR at all.

This branch (which is mostly by Andreas) changes that to behave like all other charms: autodetect first, if it fails, use the passed-in config value.

I've added a few unit tests for all the cases.

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

charm_lint_check #11026 percona-cluster-next for danilo mp272813
    LINT OK: passed

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

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

charm_unit_test #10236 percona-cluster-next for danilo mp272813
    UNIT OK: passed

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

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

charm_amulet_test #6879 percona-cluster-next for danilo mp272813
    AMULET OK: passed

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

[Ryan Beisner (1chb1n)]

FYI, full amulet output: http://paste.ubuntu.com/12619610/

Be aware, that the percona-cluster amulet tests are on my list to refactor and extend. Until then, these existing tests do exercise some basic functionality, on Trusty only.

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-09-22 13:54:27 +0000
+++ hooks/percona_hooks.py	2015-09-29 15:46:38 +0000
@@ -75,6 +75,7 @@
 from charmhelpers.payload.execd import execd_preinstall
 from charmhelpers.contrib.network.ip import (
     get_address_in_network,
+    get_iface_for_address,
     get_netmask_for_address,
     get_ipv6_addr,
     is_address_in_network,
@@ -535,8 +536,8 @@
 @hooks.hook('ha-relation-joined')
 def ha_relation_joined():
     vip = config('vip')
-    vip_iface = config('vip_iface')
-    vip_cidr = config('vip_cidr')
+    vip_iface = get_iface_for_address(vip) or config('vip_iface')
+    vip_cidr = get_netmask_for_address(vip) or config('vip_cidr')
     corosync_bindiface = config('ha-bindiface')
     corosync_mcastport = config('ha-mcastport')
 
@@ -547,7 +548,7 @@
     if config('prefer-ipv6'):
         res_mysql_vip = 'ocf:heartbeat:IPv6addr'
         vip_params = 'params ipv6addr="%s" cidr_netmask="%s" nic="%s"' % \
-                     (vip, get_netmask_for_address(vip), vip_iface)
+                     (vip, vip_cidr, vip_iface)
     else:
         res_mysql_vip = 'ocf:heartbeat:IPaddr2'
         vip_params = 'params ip="%s" cidr_netmask="%s" nic="%s"' % \

=== modified file 'unit_tests/test_percona_hooks.py'
--- unit_tests/test_percona_hooks.py	2015-09-15 23:55:31 +0000
+++ unit_tests/test_percona_hooks.py	2015-09-29 15:46:38 +0000
@@ -9,7 +9,9 @@
             'get_db_helper',
             'relation_ids',
             'relation_set',
-            'update_nrpe_config']
+            'update_nrpe_config',
+            'get_iface_for_address',
+            'get_netmask_for_address']
 
 
 class TestHaRelation(CharmTestCase):
@@ -35,6 +37,8 @@
         attrs = {'get_mysql_password.return_value': password}
         helper.configure_mock(**attrs)
         self.get_db_helper.return_value = helper
+        self.get_netmask_for_address.return_value = None
+        self.get_iface_for_address.return_value = None
         self.test_config.set('vip', '10.0.3.3')
         self.test_config.set('sst-password', password)
 
@@ -65,3 +69,61 @@
             corosync_mcastport=f('ha-mcastport'), resources=resources,
             resource_params=resource_params, groups=groups,
             clones=clones, colocations=colocations, locations=locations)
+
+    def test_resource_params_vip_cidr_iface_autodetection(self):
+        """
+        Auto-detected values for vip_cidr and vip_iface are used to configure
+        VIPs, even when explicit config options are provided.
+        """
+        self.relation_ids.return_value = ['ha:1']
+        helper = mock.Mock()
+        self.get_db_helper.return_value = helper
+        self.get_netmask_for_address.return_value = '20'
+        self.get_iface_for_address.return_value = 'eth1'
+        self.test_config.set('vip', '10.0.3.3')
+        self.test_config.set('vip_cidr', '16')
+        self.test_config.set('vip_iface', 'eth0')
+
+        def f(k):
+            return self.test_config.get(k)
+
+        self.config.side_effect = f
+        hooks.ha_relation_joined()
+
+        resource_params = {'res_mysql_vip': ('params ip="10.0.3.3" '
+                                             'cidr_netmask="20" '
+                                             'nic="eth1"'),
+                           'res_mysql_monitor':
+                           hooks.RES_MONITOR_PARAMS % {'sstpass': 'None'}}
+
+        call_args, call_kwargs = self.relation_set.call_args
+        self.assertEqual(resource_params, call_kwargs['resource_params'])
+
+    def test_resource_params_no_vip_cidr_iface_autodetection(self):
+        """
+        When autodetecting vip_cidr and vip_iface fails, values from
+        vip_cidr and vip_iface config options are used instead.
+        """
+        self.relation_ids.return_value = ['ha:1']
+        helper = mock.Mock()
+        self.get_db_helper.return_value = helper
+        self.get_netmask_for_address.return_value = None
+        self.get_iface_for_address.return_value = None
+        self.test_config.set('vip', '10.0.3.3')
+        self.test_config.set('vip_cidr', '16')
+        self.test_config.set('vip_iface', 'eth1')
+
+        def f(k):
+            return self.test_config.get(k)
+
+        self.config.side_effect = f
+        hooks.ha_relation_joined()
+
+        resource_params = {'res_mysql_vip': ('params ip="10.0.3.3" '
+                                             'cidr_netmask="16" '
+                                             'nic="eth1"'),
+                           'res_mysql_monitor':
+                           hooks.RES_MONITOR_PARAMS % {'sstpass': 'None'}}
+
+        call_args, call_kwargs = self.relation_set.call_args
+        self.assertEqual(resource_params, call_kwargs['resource_params'])