Merge lp:~jacekn/charm-helpers/nrpe-hostname into lp:charm-helpers

[Jacek Nykis]

Add optional hostname parameter to NRPE class. This is useful in MAAS environments where machines can have real hostnames in DNS.

[Tim Van Steenburgh (tvansteenburgh)]

Hi Jacek, thanks for this improvement to charmhelpers!

+1 LGTM, tests all pass.

A Charmer will be along to merge these changes soon.

review: Approve

[Jorge Niedbalski (niedbalski)]

Hi Jacek,

Thanks for working on charmhelpers.

I added a simple test case for covering your change, please merge https://code.launchpad.net/~niedbalski/charm-helpers/nrpe-hostname/+merge/220842 into your code.

Please note that is a good practice to include a test case for cover your change.

review: Needs Fixing

[lp:~jacekn/charm-helpers/nrpe-hostname]

146. By Jacek Nykis on 2014-05-28

Merged test from niedbalski

[Jacek Nykis (jacekn)]

Merged test code as requested, thank you Jorge.

review: Needs Resubmitting

[Jorge Niedbalski (niedbalski)]

review: Approve

=== modified file 'charmhelpers/contrib/charmsupport/nrpe.py'
--- charmhelpers/contrib/charmsupport/nrpe.py	2013-11-22 17:14:21 +0000
+++ charmhelpers/contrib/charmsupport/nrpe.py	2014-05-28 09:23:31 +0000
@@ -179,12 +179,15 @@
     nagios_exportdir = '/var/lib/nagios/export'
     nrpe_confdir = '/etc/nagios/nrpe.d'
 
-    def __init__(self):
+    def __init__(self, hostname=None):
         super(NRPE, self).__init__()
         self.config = config()
         self.nagios_context = self.config['nagios_context']
         self.unit_name = local_unit().replace('/', '-')
-        self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
+        if hostname:
+            self.hostname = hostname
+        else:
+            self.hostname = "{}-{}".format(self.nagios_context, self.unit_name)
         self.checks = []
 
     def add_check(self, *args, **kwargs):

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2013-11-29 11:02:19 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2014-05-28 09:23:31 +0000
@@ -59,6 +59,16 @@
         self.assertEqual('testctx-testunit', checker.hostname)
         self.check_call_counts(config=1)
 
+    def test_init_hostname(self):
+        """Test that the hostname parameter is correctly set"""
+        checker = nrpe.NRPE()
+        self.assertEqual(checker.hostname,
+                         "{}-{}".format(checker.nagios_context,
+                                        checker.unit_name))
+        hostname = "test.host"
+        checker = nrpe.NRPE(hostname=hostname)
+        self.assertEqual(checker.hostname, hostname)
+
     def test_no_nagios_installed_bails(self):
         self.patched['config'].return_value = {'nagios_context': 'test'}
         self.patched['getgrnam'].side_effect = KeyError