Merge lp:~niedbalski/charms/trusty/rabbitmq-server/fix-lp-1500552 into lp:~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

[Jorge Niedbalski]

Fix for LP: #1500552

[lp:~niedbalski/charms/trusty/rabbitmq-server/fix-lp-1500552]

116. By Jorge Niedbalski on 2015-09-28

Skip update nrpe checks if no relation nrpe-relation-changed has been made

[Ryan Beisner (1chb1n)]

Thank you for your work on this. This proposal, or its refactored equivalent, will need to be proposed as a gerrit change if it is to be exercised and reviewed.

review: Needs Resubmitting

Unmerged revisions

116. By Jorge Niedbalski on 2015-09-28

Skip update nrpe checks if no relation nrpe-relation-changed has been made

115. By Jorge Niedbalski on 2015-09-28

- Fix for LP: #1500552
- Adds an exception retry block on 'create_vhost' method.
- Adds unit test for rabbit_utils.create_vhost method.

=== modified file 'hooks/rabbit_utils.py'
--- hooks/rabbit_utils.py	2015-09-16 17:56:59 +0000
+++ hooks/rabbit_utils.py	2015-09-28 21:40:59 +0000
@@ -11,6 +11,10 @@
     get_hostname,
 )
 
+from charmhelpers.core.decorators import (
+    retry_on_exception,
+)
+
 from charmhelpers.core.hookenv import (
     config,
     relation_ids,
@@ -99,6 +103,7 @@
     return vhost in list_vhosts()
 
 
+@retry_on_exception(3, base_delay=3, exc_type=subprocess.CalledProcessError)
 def create_vhost(vhost):
     if vhost_exists(vhost):
         return

=== modified file 'hooks/rabbitmq_server_relations.py'
--- hooks/rabbitmq_server_relations.py	2015-09-22 13:55:23 +0000
+++ hooks/rabbitmq_server_relations.py	2015-09-28 21:40:59 +0000
@@ -546,6 +546,12 @@
 
 @hooks.hook('nrpe-external-master-relation-changed')
 def update_nrpe_checks():
+
+    if not is_relation_made("nrpe-external-master"):
+        log("Not found relation nrpe-external-master, skipping update nrpe checks",
+            level=WARN)
+        return
+
     if os.path.isdir(NAGIOS_PLUGINS):
         rsync(os.path.join(os.getenv('CHARM_DIR'), 'scripts',
                            'check_rabbitmq.py'),

=== modified file 'unit_tests/test_rabbit_utils.py'
--- unit_tests/test_rabbit_utils.py	2015-04-13 15:42:57 +0000
+++ unit_tests/test_rabbit_utils.py	2015-09-28 21:40:59 +0000
@@ -3,6 +3,7 @@
 import unittest
 import tempfile
 import sys
+import subprocess
 
 import rabbit_utils
 sys.modules['MySQLdb'] = mock.Mock()
@@ -69,3 +70,30 @@
         self.assertEqual(lines[0], "#somedata\n")
         self.assertEqual(lines[1], "%s %s\n" % (map.items()[0]))
         self.assertEqual(lines[4], "%s %s\n" % (map.items()[3]))
+
+    @mock.patch("rabbit_utils.log")
+    @mock.patch("rabbit_utils.vhost_exists")
+    @mock.patch("rabbit_utils.subprocess.check_call")
+    def test_create_vhost(self, check_call, vhost, log):
+        vhost.return_value = False
+        rabbit_utils.create_vhost("rabbit")
+        check_call.assert_called_once_with([rabbit_utils.RABBITMQ_CTL,
+                                            'add_vhost',
+                                            "rabbit"])
+
+    @mock.patch("charmhelpers.core.decorators.log")
+    @mock.patch("rabbit_utils.log")
+    @mock.patch("rabbit_utils.vhost_exists")
+    @mock.patch("rabbit_utils.subprocess.check_call")
+    def test_create_vhost_exc(self, check_call, vhost, log, *a, **k):
+        vhost.return_value = False
+
+        def f(*a, **k):
+            raise subprocess.CalledProcessError(-1, "")
+
+        check_call.side_effect = f
+
+        try:
+            rabbit_utils.create_vhost("rabbit")
+        except:
+            self.assertTrue(len(check_call.mock_calls) > 1)