Merge lp:~gnuoy/charm-helpers/get-hwaddr into lp:charm-helpers

[Liam Young]

* Fix to tests broken by previous nrpe update
* Function with test to get the hardware address for a given nic

[lp:~gnuoy/charm-helpers/get-hwaddr]

106. By Liam Young on 2013-11-29

Fix copy/pasta error in test_get_nic_hwaddr (s/mtu/hwaddr)

[Gareth Woolridge (moon127)]

Looks good to me with the update to the test as discussed.

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2013-11-14 10:37:18 +0000
+++ charmhelpers/core/host.py	2013-11-29 11:25:06 +0000
@@ -279,3 +279,13 @@
         if 'mtu' in words:
             mtu = words[words.index("mtu") + 1]
     return mtu
+
+
+def get_nic_hwaddr(nic):
+    cmd = ['ip', '-o', '-0', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd)
+    hwaddr = ""
+    words = ip_output.split()
+    if 'link/ether' in words:
+        hwaddr = words[words.index('link/ether') + 1]
+    return hwaddr

=== modified file 'tests/contrib/charmsupport/test_nrpe.py'
--- tests/contrib/charmsupport/test_nrpe.py	2013-06-19 15:18:16 +0000
+++ tests/contrib/charmsupport/test_nrpe.py	2013-11-29 11:25:06 +0000
@@ -126,7 +126,7 @@
 """
         expected = [
             '# check myservice\n',
-            'command[check_myservice]=/check_http http://localhost\n',
+            'command[check_myservice]=/usr/lib/nagios/plugins/check_http http://localhost\n',
             service_file_contents,
         ]
         actual = [x[0][0] for x in outfile.write.call_args_list]
@@ -199,15 +199,14 @@
         check = nrpe.Check('shortname', 'description', 'check_http -x -y -z')
 
         self.assertEqual('', check.check_cmd)
-        self.assertEqual(3, self.patched['exists'].call_count)
+        self.assertEqual(2, self.patched['exists'].call_count)
         expected = [
-            '/check_http',
-            '/usr/lib/test_charm_dir/files/nrpe-external-master/check_http',
             '/usr/lib/nagios/plugins/check_http',
+            '/usr/local/lib/nagios/plugins/check_http',
         ]
         actual = [x[0][0] for x in self.patched['exists'].call_args_list]
         self.assertEqual(expected, actual)
-        self.check_call_counts(exists=3, log=1)
+        self.check_call_counts(exists=2, log=1)
         expected = 'Check command not found: check_http'
         self.assertEqual(expected, self.patched['log'].call_args[0][0])
 

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2013-11-14 10:37:18 +0000
+++ tests/core/test_host.py	2013-11-29 11:25:06 +0000
@@ -34,6 +34,8 @@
     link/ether e4:11:5b:ab:a7:3c brd ff:ff:ff:ff:ff:ff
 """)
 
+IP_LINE_HWADDR = ("""2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000\    link/ether e4:11:5b:ab:a7:3c brd ff:ff:ff:ff:ff:ff""")
+
 IP_LINES = IP_LINE_ETH0 + IP_LINE_ETH1
 
 
@@ -681,3 +683,10 @@
         nic = "eth0"
         mtu = host.get_nic_mtu(nic)
         self.assertEqual(mtu, '1500')
+
+    @patch('subprocess.check_output')
+    def test_get_nic_hwaddr(self, check_output):
+        check_output.return_value = IP_LINE_HWADDR
+        nic = "eth0"
+        hwaddr = host.get_nic_hwaddr(nic)
+        self.assertEqual(hwaddr, 'e4:11:5b:ab:a7:3c')