Merge lp:~julian-edwards/maas/find_ip_via_arp_fixes into lp:~maas-committers/maas/trunk

[Julian Edwards]

Ignore case when looking up MAC addresses in find_ip_via_arp()

[Julian Edwards (julian-edwards)]

review: Approve (trivial)

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2014-08-27 09:20:56 +0000
+++ src/provisioningserver/utils/network.py	2014-09-10 06:01:46 +0000
@@ -75,7 +75,7 @@
 
     for line in sorted(output):
         columns = line.split()
-        if len(columns) == 5 and columns[2] == mac:
+        if len(columns) == 5 and columns[2].lower() == mac.lower():
             return columns[0]
     return None
 

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2014-08-28 06:29:39 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2014-09-10 06:01:46 +0000
@@ -104,6 +104,14 @@
         self.assertIn(one_result, ips)
         self.assertEqual(one_result, other_result)
 
+    def test__ignores_case(self):
+        sample = """\
+        192.168.0.1 ether   90:f6:52:f6:17:92   C                     eth0
+        """
+        self.patch_call(sample)
+        ip_address_observed = find_ip_via_arp("90:f6:52:f6:17:92".upper())
+        self.assertEqual("192.168.0.1", ip_address_observed)
+
 
 class TestFindMACViaARP(MAASTestCase):