Merge lp:~gnuoy/charm-helpers/add-nrpe-gethostname 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-01-12 10:11:00 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2015-01-12 11:19:22 +0000
@@ -247,6 +247,17 @@
             return rel['nagios_host_context']
 
 
+def get_nagios_hostname(relation_name='nrpe-external-master'):
+    """
+    Query relation with nrpe subordinate, return the nagios_hostname
+
+    :param str relation_name: Name of relation nrpe sub joined to
+    """
+    for rel in relations_of_type(relation_name):
+        if 'nagios_hostname' in rel:
+            return rel['nagios_hostname']
+
+
 def get_nagios_unit_name(relation_name='nrpe-external-master'):
     """
     Return the nagios unit name prepended with host_context if needed

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2015-01-12 09:58:18 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2015-01-12 11:19:22 +0000
@@ -256,6 +256,17 @@
         self.patched['relations_of_type'].return_value = [rel_info]
         self.assertEqual(nrpe.get_nagios_hostcontext(), 'bob')
 
+    def test_get_nagios_hostname(self):
+        rel_info = {
+            'nagios_hostname': 'bob-openstack-dashboard-0',
+            'private-address': '10.5.3.103',
+            '__unit__': u'dashboard-nrpe/1',
+            '__relid__': u'nrpe-external-master:2',
+            'nagios_host_context': u'bob',
+        }
+        self.patched['relations_of_type'].return_value = [rel_info]
+        self.assertEqual(nrpe.get_nagios_hostname(), 'bob-openstack-dashboard-0')
+
     def test_get_nagios_unit_name(self):
         rel_info = {
             'nagios_hostname': 'bob-openstack-dashboard-0',