Merge lp:~rvb/maas/multiple-dhcp-intf2 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Include the "interface <inft>" statement in each subnet declaration in the DHCP config.

Although this feature is not well documented, the experiment shows that it does what we want: restrict each subnet to a particular interface.

While fixing src/provisioningserver/dhcp/writer.py, I discovered that we don't actually use this script in the packaging anymore. Maybe it's a feature on which people rely but if it's not, we might as well get rid of this. The normal way to write MAAS' DHCP config file is through the celery task (triggered from the UI or the API/CLI).

[Jeroen T. Vermeulen (jtv)]

review: Approve

=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
--- etc/maas/templates/dhcp/dhcpd.conf.template	2014-01-27 20:16:45 +0000
+++ etc/maas/templates/dhcp/dhcpd.conf.template	2014-01-29 10:42:41 +0000
@@ -8,6 +8,7 @@
 {{for dhcp_subnet in dhcp_subnets}}
 subnet {{dhcp_subnet['subnet']}} netmask {{dhcp_subnet['subnet_mask']}} {
        filename "{{bootloader}}";
+       interface {{dhcp_subnet['interface']}};
        ignore-client-uids true;
        option subnet-mask {{dhcp_subnet['subnet_mask']}};
        option broadcast-address {{dhcp_subnet['broadcast_ip']}};

=== modified file 'src/maasserver/dhcp.py'
--- src/maasserver/dhcp.py	2014-01-29 08:22:53 +0000
+++ src/maasserver/dhcp.py	2014-01-29 10:42:41 +0000
@@ -63,6 +63,7 @@
                 IPAddress(interface.subnet_mask)),
             subnet_mask=interface.subnet_mask,
             broadcast_ip=interface.broadcast_ip,
+            interface=interface.interface,
             router_ip=interface.router_ip,
             dns_servers=dns_server,
             ntp_server=ntp_server,

=== modified file 'src/maasserver/tests/test_dhcp.py'
--- src/maasserver/tests/test_dhcp.py	2014-01-29 08:27:52 +0000
+++ src/maasserver/tests/test_dhcp.py	2014-01-29 10:42:41 +0000
@@ -110,6 +110,7 @@
         dhcp_subnets = []
         for interface in nodegroup.get_managed_interfaces():
             dhcp_params = [
+                'interface',
                 'subnet_mask',
                 'broadcast_ip',
                 'router_ip',

=== modified file 'src/provisioningserver/dhcp/tests/test_config.py'
--- src/provisioningserver/dhcp/tests/test_config.py	2014-01-27 19:55:37 +0000
+++ src/provisioningserver/dhcp/tests/test_config.py	2014-01-29 10:42:41 +0000
@@ -37,6 +37,7 @@
     {{omapi_key}}
     {{for dhcp_subnet in dhcp_subnets}}
         {{dhcp_subnet['subnet']}}
+        {{dhcp_subnet['interface']}}
         {{dhcp_subnet['subnet_mask']}}
         {{dhcp_subnet['broadcast_ip']}}
         {{dhcp_subnet['dns_servers']}}
@@ -57,6 +58,7 @@
         omapi_key="random",
         dhcp_subnets=[dict(
             subnet="10.0.0.0",
+            interface="eth0",
             subnet_mask="255.0.0.0",
             broadcast_ip="10.255.255.255",
             dns_servers="10.1.0.1 10.1.0.2",

=== modified file 'src/provisioningserver/dhcp/tests/test_writer.py'
--- src/provisioningserver/dhcp/tests/test_writer.py	2014-01-20 09:01:25 +0000
+++ src/provisioningserver/dhcp/tests/test_writer.py	2014-01-29 10:42:41 +0000
@@ -37,6 +37,7 @@
 
     test_args = (
         '--subnet', 'subnet',
+        '--interface', 'eth0',
         '--subnet-mask', 'subnet-mask',
         '--broadcast-ip', 'broadcast-ip',
         '--dns-servers', 'dns-servers',
@@ -67,6 +68,7 @@
         self.assertThat(
             args, MatchesStructure.byEquality(
                 subnet='subnet',
+                interface='eth0',
                 subnet_mask='subnet-mask',
                 broadcast_ip='broadcast-ip',
                 dns_servers='dns-servers',
@@ -86,6 +88,7 @@
         output = sys.stdout.getvalue()
         contains_all_params = ContainsAll([
             'subnet',
+            'interface',
             'subnet-mask',
             'broadcast-ip',
             'omapi-key',
@@ -109,6 +112,7 @@
             output = stream.read()
         contains_all_params = ContainsAll([
             'subnet',
+            'interface',
             'subnet-mask',
             'broadcast-ip',
             'omapi-key',

=== modified file 'src/provisioningserver/dhcp/writer.py'
--- src/provisioningserver/dhcp/writer.py	2014-01-27 19:43:00 +0000
+++ src/provisioningserver/dhcp/writer.py	2014-01-29 10:42:41 +0000
@@ -31,6 +31,9 @@
         "--subnet", action="store", required=True, help=(
             "Base subnet declaration, e.g. 192.168.1.0"))
     parser.add_argument(
+        "--interface", action="store", required=True, help=(
+            "Interface name, e.g. eth0"))
+    parser.add_argument(
         "--subnet-mask", action="store", required=True, help=(
             "The mask for the subnet, e.g. 255.255.255.0"))
     parser.add_argument(