Merge lp:~mpontillo/curtin/fix-improper-inet6-bug-1588547 into lp:~curtin-dev/curtin/trunk

[Mike Pontillo]

Don't append the '6' to IPv4 aliases if an IPv6 alias preceded it.

[Ryan Harper (raharper)]

Comment inline.

review: Needs Fixing

[Mike Pontillo (mpontillo)]

Thanks; I'll update this.

I guess there isn't an existing test case for this to change, like for the bond test case?

[lp:~mpontillo/curtin/fix-improper-inet6-bug-1588547]

392. By Mike Pontillo on 2016-06-03

Address review comment.

[Mike Pontillo (mpontillo)]

I've made your suggested change. I think this is ready for another look.

[Ryan Harper (raharper)]

> Thanks; I'll update this.
>
> I guess there isn't an existing test case for this to change, like for the
> bond test case?

No, mainly because I need to fix up the vmtest ifconfig_a output parser to handle what ipv6 looks like. I have a separate ivp6 related branch and I'll bring an aliased interface with ipv4 into it.

[Ryan Harper (raharper)]

review: Approve

=== modified file 'curtin/net/__init__.py'
--- curtin/net/__init__.py	2016-04-20 20:03:00 +0000
+++ curtin/net/__init__.py	2016-06-03 20:00:33 +0000
@@ -423,10 +423,14 @@
                 iface['index'] = index
                 iface['mode'] = subnet['type']
                 iface['control'] = subnet.get('control', 'auto')
+                subnet_inet = 'inet'
                 if iface['mode'].endswith('6'):
-                    iface['inet'] += '6'
+                    # This is a request for DHCPv6.
+                    subnet_inet += '6'
                 elif iface['mode'] == 'static' and ":" in subnet['address']:
-                    iface['inet'] += '6'
+                    # This is a static IPv6 address.
+                    subnet_inet += '6'
+                iface['inet'] = subnet_inet
                 if iface['mode'].startswith('dhcp'):
                     iface['mode'] = 'dhcp'
 

=== modified file 'tests/unittests/test_net.py'
--- tests/unittests/test_net.py	2016-05-17 20:04:00 +0000
+++ tests/unittests/test_net.py	2016-06-03 20:00:33 +0000
@@ -566,4 +566,45 @@
         self.assertEqual(sorted(ifaces.split('\n')),
                          sorted(net_ifaces.split('\n')))
 
+    def test_render_interfaces_ipv6_aliases(self):
+        ipv6_aliases_config = '''
+# YAML example of a simple network config
+network:
+    version: 1
+    config:
+        # Physical interfaces.
+        - type: physical
+          name: eth0
+          mac_address: "c0:d6:9f:2c:e8:80"
+          subnets:
+              - type: static
+                address: fde9:8f83:4a81:1:0:1:0:6/64
+              - type: static
+                address: 192.168.0.1/24
+'''
+
+        ns = self.get_net_state(ipv6_aliases_config)
+        ifaces = dedent("""\
+            auto lo
+            iface lo inet loopback
+
+            auto eth0
+            iface eth0 inet6 static
+                address fde9:8f83:4a81:1:0:1:0:6/64
+
+            auto eth0:1
+            iface eth0:1 inet static
+                address 192.168.0.1/24
+
+            source /etc/network/interfaces.d/*.cfg
+            """)
+        net_ifaces = net.render_interfaces(ns.network_state)
+        print("\n".join(sorted(ifaces.split('\n'))))
+        print("\n^^ LOCAL -- RENDER vv")
+        print("\n".join(sorted(net_ifaces.split('\n'))))
+        print(ns.network_state.get('interfaces'))
+        self.assertEqual(sorted(ifaces.split('\n')),
+                         sorted(net_ifaces.split('\n')))
+
+
 # vi: ts=4 expandtab syntax=python