Merge lp:~blake-rouse/maas/fix-1353597 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Forces the mac address in format_bootif to lower.

[Jason Hobbs (jason-hobbs)]

looks good.

review: Approve

=== modified file 'src/provisioningserver/boot/powernv.py'
--- src/provisioningserver/boot/powernv.py	2014-06-20 16:26:31 +0000
+++ src/provisioningserver/boot/powernv.py	2014-08-06 17:14:40 +0000
@@ -61,7 +61,7 @@
     """Formats a mac address into the BOOTIF format, expected by
     the linux kernel."""
     mac = mac.replace(':', '-')
-    mac = mac.upper()
+    mac = mac.lower()
     return '%02x-%s' % (ARP_HTYPE.ETHERNET, mac)
 
 

=== modified file 'src/provisioningserver/boot/tests/test_powernv.py'
--- src/provisioningserver/boot/tests/test_powernv.py	2014-07-16 14:12:13 +0000
+++ src/provisioningserver/boot/tests/test_powernv.py	2014-08-06 17:14:40 +0000
@@ -232,6 +232,19 @@
         expected = 'BOOTIF=%s' % format_bootif(fake_mac)
         self.assertIn(expected, config['execute']['APPEND'])
 
+    def test_format_bootif_replaces_colon(self):
+        fake_mac = factory.getRandomMACAddress()
+        self.assertEqual(
+            '01-%s' % fake_mac.replace(':', '-').lower(),
+            format_bootif(fake_mac))
+
+    def test_format_bootif_makes_mac_address_lower(self):
+        fake_mac = factory.getRandomMACAddress()
+        fake_mac = fake_mac.upper()
+        self.assertEqual(
+            '01-%s' % fake_mac.replace(':', '-').lower(),
+            format_bootif(fake_mac))
+
 
 class TestPowerNVBootMethodPathPrefix(MAASTestCase):
     """Tests for