Merge lp:~freyes/charms/trusty/hacluster/add-location into lp:~openstack-charmers/charms/trusty/hacluster/next

[Felipe Reyes]

Dear OpenStack Charmers,

Add 'location' parameter to define location rules[0]. Fixes bug #1428850, and it's to fix bug #1426508

Having this consumers can define rules like "grp_percona_cluster rule inf: writable eq 1" which mean "the percona cluster vip has to be always running on a node that has the 'writable' property set to 1", in this example mysql_monitor agent will take care of check the state of percona and change the properties to reflect their actual state.

Best,

[0] http://clusterlabs.org/doc/en-US/Pacemaker/1.1-crmsh/html/Clusters_from_Scratch/_specifying_a_preferred_location.html

[Jorge Niedbalski (niedbalski)]

Felipe,

Thanks for this patch. Mind to add a test for covering your change?

review: Needs Fixing

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

charm_lint_check #2488 hacluster-next for freyes mp252022
    LINT OK: passed

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

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

charm_unit_test #2278 hacluster-next for freyes mp252022
    UNIT OK: passed

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

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

charm_amulet_test #2360 hacluster-next for freyes mp252022
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10543782/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2360/

[Felipe Reyes (freyes)]

@niedbalski, added a unit test as suggested :) thanks to it the coverage went from 23% to 51%, so thanks for encourage me to add it.

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

charm_lint_check #2492 hacluster-next for freyes mp252127
    LINT OK: passed

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

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

charm_amulet_test #2364 hacluster-next for freyes mp252127
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10553671/
Build: http://10.245.162.77:8080/job/charm_amulet_test/2364/

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

charm_unit_test #2282 hacluster-next for freyes mp252127
    UNIT OK: passed

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

=== modified file '.bzrignore'
--- .bzrignore	2014-10-12 08:12:10 +0000
+++ .bzrignore	2015-03-06 15:20:06 +0000
@@ -1,1 +1,2 @@
 bin
+.coverage

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-12-17 17:17:29 +0000
+++ hooks/hooks.py	2015-03-06 15:20:06 +0000
@@ -350,6 +350,7 @@
         orders = parse_data(relid, unit, 'orders')
         colocations = parse_data(relid, unit, 'colocations')
         clones = parse_data(relid, unit, 'clones')
+        locations = parse_data(relid, unit, 'locations')
         init_services = parse_data(relid, unit, 'init_services')
     else:
         log('Related to {} ha services'.format(len(relids)))
@@ -374,7 +375,7 @@
     # from the oldest peer unit.
     if oldest_peer(peer_units()):
         log('Deleting Resources')
-        log(str(delete_resources))
+        log(delete_resources)
         for res_name in delete_resources:
             if pcmk.crm_opt_exists(res_name):
                 log('Stopping and deleting resource %s' % res_name)
@@ -383,7 +384,7 @@
                 pcmk.commit('crm -w -F configure delete %s' % res_name)
 
         log('Configuring Resources')
-        log(str(resources))
+        log(resources)
         for res_name, res_type in resources.iteritems():
             # disable the service we are going to put in HA
             if res_type.split(':')[0] == "lsb":
@@ -415,7 +416,7 @@
                     pcmk.commit(cmd)
 
         log('Configuring Groups')
-        log(str(groups))
+        log(groups)
         for grp_name, grp_params in groups.iteritems():
             if not pcmk.crm_opt_exists(grp_name):
                 cmd = 'crm -w -F configure group %s %s' % (grp_name,
@@ -424,7 +425,7 @@
                 log('%s' % cmd)
 
         log('Configuring Master/Slave (ms)')
-        log(str(ms))
+        log(ms)
         for ms_name, ms_params in ms.iteritems():
             if not pcmk.crm_opt_exists(ms_name):
                 cmd = 'crm -w -F configure ms %s %s' % (ms_name, ms_params)
@@ -432,7 +433,7 @@
                 log('%s' % cmd)
 
         log('Configuring Orders')
-        log(str(orders))
+        log(orders)
         for ord_name, ord_params in orders.iteritems():
             if not pcmk.crm_opt_exists(ord_name):
                 cmd = 'crm -w -F configure order %s %s' % (ord_name,
@@ -441,7 +442,7 @@
                 log('%s' % cmd)
 
         log('Configuring Colocations')
-        log(str(colocations))
+        log(colocations)
         for col_name, col_params in colocations.iteritems():
             if not pcmk.crm_opt_exists(col_name):
                 cmd = 'crm -w -F configure colocation %s %s' % (col_name,
@@ -450,7 +451,7 @@
                 log('%s' % cmd)
 
         log('Configuring Clones')
-        log(str(clones))
+        log(clones)
         for cln_name, cln_params in clones.iteritems():
             if not pcmk.crm_opt_exists(cln_name):
                 cmd = 'crm -w -F configure clone %s %s' % (cln_name,
@@ -458,6 +459,15 @@
                 pcmk.commit(cmd)
                 log('%s' % cmd)
 
+        log('Configuring Locations')
+        log(locations)
+        for loc_name, loc_params in locations.iteritems():
+            if not pcmk.crm_opt_exists(loc_name):
+                cmd = 'crm -w -F configure location %s %s' % (loc_name,
+                                                              loc_params)
+                pcmk.commit(cmd)
+                log('%s' % cmd)
+
         for res_name, res_type in resources.iteritems():
             if len(init_services) != 0 and res_name in init_services:
                 # Checks that the resources are running and started.

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2015-03-06 15:20:06 +0000
@@ -0,0 +1,6 @@
+[nosetests]
+verbosity=2
+with-coverage=1
+cover-erase=1
+cover-package=hooks
+

=== modified file 'unit_tests/test_hacluster_hooks.py'
--- unit_tests/test_hacluster_hooks.py	2014-12-15 12:55:12 +0000
+++ unit_tests/test_hacluster_hooks.py	2015-03-06 15:20:06 +0000
@@ -89,3 +89,87 @@
 
             matches = re.findall(pattern, content, re.M)
             self.assertEqual(len(matches), 2, str(matches))
+
+    @mock.patch('pcmk.wait_for_pcmk')
+    @mock.patch('hooks.peer_units')
+    @mock.patch('pcmk.crm_opt_exists')
+    @mock.patch('hooks.oldest_peer')
+    @mock.patch('hooks.configure_corosync')
+    @mock.patch('hooks.configure_cluster_global')
+    @mock.patch('hooks.configure_monitor_host')
+    @mock.patch('hooks.configure_stonith')
+    @mock.patch('hooks.related_units')
+    @mock.patch('hooks.get_cluster_nodes')
+    @mock.patch('hooks.relation_set')
+    @mock.patch('hooks.relation_ids')
+    @mock.patch('hooks.get_corosync_conf')
+    @mock.patch('pcmk.commit')
+    @mock.patch('hooks.config')
+    @mock.patch('hooks.parse_data')
+    def test_configure_principle_cluster_resources(self, parse_data, config,
+                                                   commit,
+                                                   get_corosync_conf,
+                                                   relation_ids, relation_set,
+                                                   get_cluster_nodes,
+                                                   related_units,
+                                                   configure_stonith,
+                                                   configure_monitor_host,
+                                                   configure_cluster_global,
+                                                   configure_corosync,
+                                                   oldest_peer, crm_opt_exists,
+                                                   peer_units, wait_for_pcmk):
+        crm_opt_exists.return_value = False
+        oldest_peer.return_value = True
+        related_units.return_value = ['ha/0', 'ha/1', 'ha/2']
+        get_cluster_nodes.return_value = ['10.0.3.2', '10.0.3.3', '10.0.3.4']
+        relation_ids.return_value = ['hanode:1']
+        get_corosync_conf.return_value = True
+        cfg = {'debug': False,
+               'prefer-ipv6': False,
+               'corosync_transport': 'udpu',
+               'corosync_mcastaddr': 'corosync_mcastaddr',
+               'cluster_count': 3}
+
+        def c(k):
+            return cfg.get(k)
+
+        config.side_effect = c
+
+        rel_get_data = {'locations': {'loc_foo': 'bar rule inf: meh eq 1'},
+                        'clones': {'cl_foo': 'res_foo meta interleave=true'},
+                        'groups': {'grp_foo': 'res_foo'},
+                        'colocations': {'co_foo': 'inf: grp_foo cl_foo'},
+                        'resources': {'res_foo': 'ocf:heartbeat:IPaddr2',
+                                      'res_bar': 'ocf:heartbear:IPv6addr'},
+                        'resource_params': {'res_foo': 'params bar'},
+                        'ms': {'ms_foo': 'res_foo meta notify=true'},
+                        'orders': {'foo_after': 'inf: res_foo ms_foo'}}
+
+        def fake_parse_data(relid, unit, key):
+            return rel_get_data.get(key, {})
+
+        parse_data.side_effect = fake_parse_data
+
+        hacluster_hooks.configure_principle_cluster_resources()
+        relation_set.assert_any_call(relation_id='hanode:1', ready=True)
+        configure_stonith.assert_called_with()
+        configure_monitor_host.assert_called_with()
+        configure_cluster_global.assert_called_with()
+        configure_corosync.assert_called_with()
+
+        for kw, key in [('location', 'locations'),
+                        ('clone', 'clones'),
+                        ('group', 'groups'),
+                        ('colocation', 'colocations'),
+                        ('primitive', 'resources'),
+                        ('ms', 'ms'),
+                        ('order', 'orders')]:
+            for name, params in rel_get_data[key].items():
+                if name in rel_get_data['resource_params']:
+                    res_params = rel_get_data['resource_params'][name]
+                    commit.assert_any_call(
+                        'crm -w -F configure %s %s %s %s' % (kw, name, params,
+                                                             res_params))
+                else:
+                    commit.assert_any_call(
+                        'crm -w -F configure %s %s %s' % (kw, name, params))