launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/leases-bug-1062041 into lp:maas.

Commit message:
Make the leases parser pick up a new leases file keyword seemingly introduced in quantal's DHCPD.  Previously, the lease was being completely ignored.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1062041 in MAAS: "leases parsing is broken again"
  https://bugs.launchpad.net/maas/+bug/1062041

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/leases-bug-1062041/+merge/128166
-- 
https://code.launchpad.net/~julian-edwards/maas/leases-bug-1062041/+merge/128166
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/leases-bug-1062041 into lp:maas.

=== modified file 'src/provisioningserver/dhcp/leases_parser.py'
--- src/provisioningserver/dhcp/leases_parser.py	2012-08-28 06:07:45 +0000
+++ src/provisioningserver/dhcp/leases_parser.py	2012-10-05 06:19:21 +0000
@@ -54,7 +54,7 @@
         ['starts', 'tstp', 'atsfp', 'tsfp', 'cltt', 'uid', 'binding', 'next',
          'client-hostname', 'abandoned', 'option', 'ddns-text',
          'ddns-fwd-name', 'ddns-client-fqdn', 'ddns-rev-name',
-         'vendor-class-identifier', 'bootp', 'reserved'],
+         'vendor-class-identifier', 'bootp', 'reserved', 'rewind'],
         caseless=True) + args
     )
 lone_statement = (

=== modified file 'src/provisioningserver/dhcp/tests/test_leases_parser.py'
--- src/provisioningserver/dhcp/tests/test_leases_parser.py	2012-08-28 06:07:45 +0000
+++ src/provisioningserver/dhcp/tests/test_leases_parser.py	2012-10-05 06:19:21 +0000
@@ -83,6 +83,7 @@
                 cltt 1 2010/01/02 05:00:00;
                 binding state free;
                 next binding state free;
+                rewind binding state free;
                 hardware ethernet %(mac)s;
                 uid "\001\000\234\002\242\2020";
                 set vendorclass = "PXEClient:Arch:00000:UNDI:002001";