launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/doris-was-hungry into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/doris-was-hungry/+merge/118341

This breaks out some small changes that grew the already oversized diff of my other branch by a disproportionate amount, and could be easily isolated.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/doris-was-hungry/+merge/118341
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/doris-was-hungry into lp:maas.

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2012-08-06 05:01:20 +0000
+++ src/maasserver/tests/test_api.py	2012-08-06 12:02:20 +0000
@@ -2317,13 +2317,13 @@
 
     def test_pxeconfig_adds_some_parameters(self):
         params_in = self.get_params()
-        optional_params = {'release', 'purpose'}
-        for param in optional_params:
+        added_params = {'release', 'purpose'}
+        for param in added_params:
             if param in params_in:
                 del params_in[param]
         params_out = self.get_pxeconfig(params_in)
         self.assertEqual(
-            set(params_out).difference(params_in), optional_params)
+            set(params_out).difference(params_in), added_params)
         # The release is always "precise".
         self.assertEqual('precise', params_out['release'])
 

=== modified file 'src/provisioningserver/tftp.py'
--- src/provisioningserver/tftp.py	2012-08-02 16:15:06 +0000
+++ src/provisioningserver/tftp.py	2012-08-06 12:02:20 +0000
@@ -66,14 +66,14 @@
     get_page = staticmethod(getPage)
     render_pxe_config = staticmethod(render_pxe_config)
 
-    # This is how PXELINUX represents a MAC address. See
-    # http://www.syslinux.org/wiki/index.php/PXELINUX.
+    # PXELINUX represents a MAC address in IEEE 802 hyphen-separated
+    # format.  See http://www.syslinux.org/wiki/index.php/PXELINUX.
     re_mac_address_octet = r'[0-9a-f]{2}'
     re_mac_address = re.compile(
         "-".join(repeat(re_mac_address_octet, 6)))
 
     # We assume that the ARP HTYPE (hardware type) that PXELINUX sends is
-    # alway Ethernet.
+    # always Ethernet.
     re_config_file = re.compile(
         r'''
         ^/?