Merge ~larsks/cloud-init:lp/1665441 into cloud-init:master

[Lars Kellogg-Stedman]

This corrects the problem reported in #1665441. The resulting files are incompatible with NetworkManager, but will work correctly in a legacy networking environment.

[Scott Moser (smoser)]

Lars,
Thanks so much for investigating and finding a fix.

I hate it when I provide a fix for a bug in someone's code and they ask for a unit test.

That said...
A unit test here will avoid a regression in the future. Could you add one?

If you don't add one, then I'm going to, and it will just take me longer to pull it.

5e8bd6b... by Lars Kellogg-Stedman on 2017-02-17

unit tests for #1665441

This adds inputs and outputs to OS_SAMPLES to test the code path for a
network configuration that provides multiple subnets on the same
interface. This test will fail until the fix for #1665441 is
committed.

LP: #1665441

[Lars Kellogg-Stedman (larsks)]

I've added a unit test.

diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index 9be7407..19e220a 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -283,10 +283,10 @@ class Renderer(renderer.Renderer):
                 cls._render_subnet(iface_cfg, route_cfg, iface_subnets[0])
             elif len(iface_subnets) > 1:
                 for i, iface_subnet in enumerate(iface_subnets,
-                                                 start=len(iface.children)):
+                                                 start=len(iface_cfg.children)):
                     iface_sub_cfg = iface_cfg.copy()
                     iface_sub_cfg.name = "%s:%s" % (iface_name, i)
-                    iface.children.append(iface_sub_cfg)
+                    iface_cfg.children.append(iface_sub_cfg)
                     cls._render_subnet(iface_sub_cfg, route_cfg, iface_subnet)
 
     @classmethod
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index b77d277..1b6288d 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -163,6 +163,91 @@ nameserver 172.19.0.12
             ('etc/udev/rules.d/70-persistent-net.rules',
              "".join(['SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ',
                       'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n']))]
+    },
+    {
+        'in_data': {
+            "services": [{"type": "dns", "address": "172.19.0.12"}],
+            "networks": [{
+                "network_id": "public-ipv4",
+                "type": "ipv4", "netmask": "255.255.252.0",
+                "link": "tap1a81968a-79",
+                "routes": [{
+                    "netmask": "0.0.0.0",
+                    "network": "0.0.0.0",
+                    "gateway": "172.19.3.254",
+                }],
+                "ip_address": "172.19.1.34", "id": "network0"
+            },{
+                "network_id": "private-ipv4",
+                "type": "ipv4", "netmask": "255.255.255.0",
+                "link": "tap1a81968a-79",
+                "routes": [],
+                "ip_address": "10.0.0.10", "id": "network1"
+            }],
+            "links": [
+                {
+                    "ethernet_mac_address": "fa:16:3e:ed:9a:59",
+                    "mtu": None, "type": "bridge", "id":
+                    "tap1a81968a-79",
+                    "vif_id": "1a81968a-797a-400f-8a80-567f997eb93f"
+                },
+            ],
+        },
+        'in_macs': {
+            'fa:16:3e:ed:9a:59': 'eth0',
+        },
+        'out_sysconfig': [
+            ('etc/sysconfig/network-scripts/ifcfg-eth0',
+             """
+# Created by cloud-init on instance boot automatically, do not edit.
+#
+BOOTPROTO=none
+DEVICE=eth0
+HWADDR=fa:16:3e:ed:9a:59
+NM_CONTROLLED=no
+ONBOOT=yes
+TYPE=Ethernet
+USERCTL=no
+""".lstrip()),
+            ('etc/sysconfig/network-scripts/ifcfg-eth0:0',
+             """
+# Created by cloud-init on instance boot automatically, do not edit.
+#
+BOOTPROTO=static
+DEFROUTE=yes
+DEVICE=eth0:0
+GATEWAY=172.19.3.254
+HWADDR=fa:16:3e:ed:9a:59
+IPADDR=172.19.1.34
+NETMASK=255.255.252.0
+NM_CONTROLLED=no
+ONBOOT=yes
+TYPE=Ethernet
+USERCTL=no
+""".lstrip()),
+            ('etc/sysconfig/network-scripts/ifcfg-eth0:1',
+             """
+# Created by cloud-init on instance boot automatically, do not edit.
+#
+BOOTPROTO=static
+DEVICE=eth0:1
+HWADDR=fa:16:3e:ed:9a:59
+IPADDR=10.0.0.10
+NETMASK=255.255.255.0
+NM_CONTROLLED=no
+ONBOOT=yes
+TYPE=Ethernet
+USERCTL=no
+""".lstrip()),
+            ('etc/resolv.conf',
+             """
+; Created by cloud-init on instance boot automatically, do not edit.
+;
+nameserver 172.19.0.12
+""".lstrip()),
+            ('etc/udev/rules.d/70-persistent-net.rules',
+             "".join(['SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ',
+                      'ATTR{address}=="fa:16:3e:ed:9a:59", NAME="eth0"\n']))]
     }
 ]
 
@@ -529,8 +614,8 @@ USERCTL=no
             self.assertEqual(expected_content, content)
 
     def test_openstack_rendering_samples(self):
-        render_dir = self.tmp_dir()
         for os_sample in OS_SAMPLES:
+            render_dir = self.tmp_dir()
             ex_input = os_sample['in_data']
             ex_mac_addrs = os_sample['in_macs']
             network_cfg = openstack.convert_net_json(