Merge lp:~raharper/curtin/trunk.fix-lp1536262 into lp:~curtin-dev/curtin/trunk

[Ryan Harper]

curtin/net: move global dns-* options under auto lo in ENI

ifupdown expects any dns-* options to be related to an iface stanza
The only iface ensured to be called with ifup is lo; moving the dns-*
parameters under iface lo allows dns options to always be present even
if other interfaces are not ifup'ed.

Update unittests and add new vmtest (TestNetworkStatic) to confirm
proper configuration under lo iface.

curtin/net: move global dns-* options under auto lo in ENI

ifupdown expects any dns-* options to be related to an iface stanza
The only iface ensured to be called with ifup is lo; moving the dns-*
parameters under iface lo allows dns options to always be present even
if other interfaces are not ifup'ed.

Update unittests and add new vmtest (TestNetworkStatic) to confirm
proper configuration under lo iface.

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:347
https://server-team-jenkins.canonical.com/job/curtin-ci/147/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/144/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/147/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

This looks good.
I'm ok to only run the wily or trusty test.
Since we have unit test coverage on the expected behavior.

review: Approve

=== modified file 'curtin/net/__init__.py'
--- curtin/net/__init__.py	2015-09-17 15:07:04 +0000
+++ curtin/net/__init__.py	2016-01-27 03:25:06 +0000
@@ -335,6 +335,11 @@
         'bridge': 2,
         'vlan': 3,
     }
+    content += "auto lo\niface lo inet loopback\n"
+    for dnskey, value in network_state.get('dns', {}).items():
+        if len(value):
+            content += "    dns-{} {}\n".format(dnskey, " ".join(value))
+
     for iface in sorted(interfaces.values(),
                         key=lambda k: (order[k['type']], k['name'])):
         content += "auto {name}\n".format(**iface)
@@ -366,10 +371,6 @@
             content += iface_add_attrs(iface)
             content += "\n"
 
-    for dnskey, value in network_state.get('dns', {}).items():
-        if len(value):
-            content += "dns-{} {}\n".format(dnskey, " ".join(value))
-
     for route in network_state.get('routes'):
         content += render_route(route)
 

=== added file 'examples/tests/basic_network_static.yaml'
--- examples/tests/basic_network_static.yaml	1970-01-01 00:00:00 +0000
+++ examples/tests/basic_network_static.yaml	2016-01-27 03:25:06 +0000
@@ -0,0 +1,17 @@
+network:
+    version: 1
+    config:
+        # Physical interfaces.
+        - type: physical
+          name: eth0
+          mac_address: "52:54:00:12:34:00"
+          subnets:
+              - type: static
+                address: 10.0.2.15/24
+                gateway: 10.0.2.2
+        - type: nameserver
+          address:
+            - 10.0.2.3
+          search:
+            - wark.maas
+            - foobar.maas

=== modified file 'tests/unittests/test_net.py'
--- tests/unittests/test_net.py	2015-09-17 15:07:04 +0000
+++ tests/unittests/test_net.py	2016-01-27 03:25:06 +0000
@@ -320,15 +320,16 @@
 
     def test_render_interfaces(self):
         ns = self.get_net_state()
-        ifaces = ('auto eth0\n' + 'iface eth0 inet dhcp\n\n' +
+        ifaces = ('auto lo\n' + 'iface lo inet loopback\n' +
+                  '    dns-nameservers 1.2.3.4 5.6.7.8\n' +
+                  '    dns-search wark.maas\n' +
+                  'auto eth0\n' + 'iface eth0 inet dhcp\n\n' +
                   'auto eth0:1\n' +
                   'iface eth0:1 inet static\n' +
                   '    address 192.168.21.3/24\n' +
                   '    dns-nameservers 8.8.8.8 8.8.4.4\n' +
                   '    dns-search barley.maas sach.maas\n\n' +
-                  'auto eth1\n' + 'iface eth1 inet manual\n\n' +
-                  'dns-nameservers 1.2.3.4 5.6.7.8\n' +
-                  'dns-search wark.maas\n')
+                  'auto eth1\n' + 'iface eth1 inet manual\n\n')
         net_ifaces = net.render_interfaces(ns.network_state)
         print(ns.network_state.get('interfaces'))
         self.assertEqual(sorted(ifaces.split('\n')),

=== modified file 'tests/vmtests/test_network.py'
--- tests/vmtests/test_network.py	2015-12-17 22:07:00 +0000
+++ tests/vmtests/test_network.py	2016-01-27 03:25:06 +0000
@@ -235,18 +235,34 @@
                 self.assertEqual(gw_ip, gw)
 
 
+class TestNetworkStaticAbs(TestNetworkAbs):
+    conf_file = "examples/tests/basic_network_static.yaml"
+
+
 class TrustyTestNetwork(relbase.trusty, TestNetworkAbs):
     __test__ = True
 
 
+class TrustyTestNetworkStatic(relbase.trusty, TestNetworkStaticAbs):
+    __test__ = True
+
+
 class VividTestNetwork(relbase.vivid, TestNetworkAbs):
     __test__ = True
 
 
+class VividTestNetworkStatic(relbase.vivid, TestNetworkStaticAbs):
+    __test__ = True
+
+
 class WilyTestNetwork(relbase.wily, TestNetworkAbs):
     __test__ = True
 
 
+class WilyTestNetworkStatic(relbase.wily, TestNetworkStaticAbs):
+    __test__ = True
+
+
 class XenialTestNetwork(relbase.xenial, TestNetworkAbs):
     __test__ = True
     # FIXME: net.ifnames=0 should not be required as image should
@@ -254,3 +270,12 @@
     #        over the net.ifnames to the installed system via '---' as the net
     #        config should take care of that.
     extra_kern_args = "net.ifnames=0"
+
+
+class XenialTestNetworkStatic(relbase.xenial, TestNetworkStaticAbs):
+    __test__ = True
+    # FIXME: net.ifnames=0 should not be required as image should
+    #        eventually address this internally.  Here we do not carry
+    #        over the net.ifnames to the installed system via '---' as the net
+    #        config should take care of that.
+    extra_kern_args = "net.ifnames=0"