Merge lp:~gnuoy/charm-helpers/nrpe-proxy into lp:charm-helpers

[Liam Young]

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2015-02-19 07:49:41 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2015-04-17 08:38:54 +0000
@@ -247,7 +247,9 @@
 
         service('restart', 'nagios-nrpe-server')
 
-        for rid in relation_ids("local-monitors"):
+        monitor_ids = relation_ids("local-monitors") + \
+            relation_ids("nrpe-external-master")
+        for rid in monitor_ids:
             relation_set(relation_id=rid, monitors=yaml.dump(monitors))
 
 

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2015-02-19 08:41:54 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2015-04-17 08:38:54 +0000
@@ -117,7 +117,14 @@
         self.patched['config'].return_value = {'nagios_context': 'a',
                                                'nagios_servicegroups': ''}
         self.patched['exists'].return_value = True
-        self.patched['relation_ids'].return_value = ['local-monitors:1']
+
+        def _rels(rname):
+            relations = {
+                'local-monitors': 'local-monitors:1',
+                'nrpe-external-master': 'nrpe-external-master:2',
+            }
+            return [relations[rname]]
+        self.patched['relation_ids'].side_effect = _rels
 
         checker = nrpe.NRPE()
         checker.add_check(shortname="myservice",
@@ -159,11 +166,14 @@
                          {'command': 'check_myservice'}}
         monitors = yaml.dump(
             {"monitors": {"remote": {"nrpe": nrpe_monitors}}})
-        self.patched['relation_set'].assert_called_once_with(
-            relation_id="local-monitors:1", monitors=monitors)
+        relation_set_calls = [
+            call(monitors=monitors, relation_id="local-monitors:1"),
+            call(monitors=monitors, relation_id="nrpe-external-master:2"),
+        ]
+        self.patched['relation_set'].assert_has_calls(relation_set_calls, any_order=True)
         self.check_call_counts(config=1, getpwnam=1, getgrnam=1,
                                exists=3, open=2, listdir=1,
-                               relation_ids=1, relation_set=1)
+                               relation_ids=2, relation_set=2)
 
 
 class NRPECheckTestCase(NRPEBaseTestCase):