Merge lp:~mpontillo/maas/bug-1506247 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix curtin networking preseed generator to render DHCP configurations appropriately.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file '.idea/maas.iml'
--- .idea/maas.iml	2015-05-16 06:21:20 +0000
+++ .idea/maas.iml	2015-10-15 01:34:27 +0000
@@ -4,6 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.bzr" />
+      <excludeFolder url="file://$MODULE_DIR$/bin" />
       <excludeFolder url="file://$MODULE_DIR$/coverage" />
       <excludeFolder url="file://$MODULE_DIR$/local" />
       <excludeFolder url="file://$MODULE_DIR$/logs" />
 
=== modified file 'src/maasserver/preseed_network.py'
--- src/maasserver/preseed_network.py	2015-09-30 07:29:27 +0000
+++ src/maasserver/preseed_network.py	2015-10-15 01:34:27 +0000
@@ -224,7 +224,8 @@
                     IPADDRESS_TYPE.DISCOVERED,
                     IPADDRESS_TYPE.DHCP,
                 ]).order_by('id'))
-        if self._is_link_up(addresses):
+        dhcp_type = self._get_dhcp_type(iface)
+        if self._is_link_up(addresses) and not dhcp_type:
             addrs.append({"type": "manual"})
         else:
             for address in addresses:
@@ -240,7 +241,6 @@
                         subnet_operation["dns_nameservers"] = (
                             subnet.dns_servers)
                     addrs.append(subnet_operation)
-            dhcp_type = self._get_dhcp_type(iface)
             if dhcp_type:
                 addrs.append(
                     {"type": dhcp_type}
 
=== modified file 'src/maasserver/tests/test_preseed_network.py'
--- src/maasserver/tests/test_preseed_network.py	2015-09-30 07:29:27 +0000
+++ src/maasserver/tests/test_preseed_network.py	2015-10-15 01:34:27 +0000
@@ -29,6 +29,7 @@
 from maasserver.preseed_network import compose_curtin_network_config
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
+from netaddr import IPNetwork
 from testtools.matchers import (
     ContainsDict,
     Equals,
@@ -311,3 +312,23 @@
         net_config += self.collectDNSConfig(node)
         config = compose_curtin_network_config(node)
         self.assertNetworkConfig(net_config, config)
+
+
+class TestDHCPNetworkLayout(MAASServerTestCase,
+                            AssertNetworkConfigMixin):
+
+    def test__dhcp_configurations_rendered(self):
+        node = factory.make_Node_with_Interface_on_Subnet()
+        iface = node.interface_set.first()
+        subnet = iface.vlan.subnet_set.first()
+        factory.make_StaticIPAddress(
+            ip=None,
+            alloc_type=IPADDRESS_TYPE.DHCP,
+            interface=iface,
+            subnet=subnet)
+        config = compose_curtin_network_config(node)
+        config_yaml = yaml.load(config[0])
+        self.assertThat(
+            config_yaml['network']['config'][0]['subnets'][0]['type'],
+            Equals('dhcp' + unicode(IPNetwork(subnet.cidr).version))
+        )