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

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 2937
Proposed branch: lp:~julian-edwards/maas/find_ip_via_arp_fixes
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 30 lines (+9/-1)
2 files modified
src/provisioningserver/utils/network.py (+1/-1)
src/provisioningserver/utils/tests/test_network.py (+8/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/find_ip_via_arp_fixes
Reviewer Review Type Date Requested Status
Julian Edwards (community) trivial Approve
Review via email: mp+234053@code.launchpad.net

Commit message

Ignore case when looking up MAC addresses in find_ip_via_arp()

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve (trivial)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/utils/network.py'
2--- src/provisioningserver/utils/network.py 2014-08-27 09:20:56 +0000
3+++ src/provisioningserver/utils/network.py 2014-09-10 06:01:46 +0000
4@@ -75,7 +75,7 @@
5
6 for line in sorted(output):
7 columns = line.split()
8- if len(columns) == 5 and columns[2] == mac:
9+ if len(columns) == 5 and columns[2].lower() == mac.lower():
10 return columns[0]
11 return None
12
13
14=== modified file 'src/provisioningserver/utils/tests/test_network.py'
15--- src/provisioningserver/utils/tests/test_network.py 2014-08-28 06:29:39 +0000
16+++ src/provisioningserver/utils/tests/test_network.py 2014-09-10 06:01:46 +0000
17@@ -104,6 +104,14 @@
18 self.assertIn(one_result, ips)
19 self.assertEqual(one_result, other_result)
20
21+ def test__ignores_case(self):
22+ sample = """\
23+ 192.168.0.1 ether 90:f6:52:f6:17:92 C eth0
24+ """
25+ self.patch_call(sample)
26+ ip_address_observed = find_ip_via_arp("90:f6:52:f6:17:92".upper())
27+ self.assertEqual("192.168.0.1", ip_address_observed)
28+
29
30 class TestFindMACViaARP(MAASTestCase):
31