Merge ~yadle/cloud-init:fix-ipv6-configuration into cloud-init:master

[Raphaël Enrici]

Nocloud v1 config passes static6 as the type of subnet. This patch replaces static6 by static during interfaces file generation as static6 is not a valid keyword in /etc/network/interfaces

nocloud v1 network-config looks like this:
version: 1
config:
    - type: physical
      name: eth0
      mac_address: b2:b8:6e:6f:58:47
      subnets:
      - type: static
        address: <ipv4 addr>
        netmask: 255.255.255.224
        gateway: <ipv4 gw addr>
      - type: static6
        address: <ipv6 addr>
        gateway: <ipv6 gw addr>
...
Without the patch this leads to that kind of file:
/etc/network/interfaces.d/50-cloud-init.cfg:
<snip>
auto eth0
iface eth0 inet static
    address <ipv4 addr>
    gateway <ipv4 gw addr>

# control-alias eth0
iface eth0 inet6 static6
    address <ipv6 addr>
    gateway <ipv6 gw addr>
<snip>
Which is not valid, at least in ubuntu xenial. With the patch we get the right entry for ipv6 configuration:
# control-alias eth0
iface eth0 inet6 static <<<---- 6 removed here
    address <ipv6 addr>
    gateway <ipv6 gw addr>

[Ryan Harper (raharper)]

Yes, that's a good catch. I can reproduce this and ifupdown produces this output:

/etc/network/interfaces.d/50-cloud-init.cfg:13: unknown or no method and no inherits keyword specified
/etc/network/interfaces.d/50-cloud-init.cfg:13: unknown or no method and no inherits keyword specified
/etc/network/interfaces.d/50-cloud-init.cfg:13: unknown or no method and no inherits keyword specified

And removing the '6' from static resolves it.

[Ryan Harper (raharper)]

Let's test that path, this is an update to an existing unittest to validate the 'static6' eni path.

http://paste.ubuntu.com/p/yP5fTDR49G/

[Dan Watkins (oddbloke)]

Hi Raphael! It looks like Ryan left you with a suggested change to this branch; are you interested in applying that change and refreshing your branch against master?

[Ryan Harper (raharper)]

Hi Raphael, I've marked this branch Work In Progress. Once you've applied the test-path I provided in the commit above, please push and change the state of this merge to Needs Review.

[Raphaël Enrici (yadle)]

Hey,
sorry for the delay, I'll work on this in the next days.
Thanks,
Raphaël

On Mon, Apr 8, 2019 at 8:17 PM Ryan Harper <email address hidden> wrote:
>
> Hi Raphael, I've marked this branch Work In Progress. Once you've applied the test-path I provided in the commit above, please push and change the state of this merge to Needs Review.
> --
> https://code.launchpad.net/~yadle/cloud-init/+git/cloud-init/+merge/362005
> You are the owner of ~yadle/cloud-init:fix-ipv6-configuration.

[Ryan Harper (raharper)]

Thanks for updating the branch. LGTM.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/243/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

review: Needs Fixing (continuous-integration)

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

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/server/job/cloud-init-autoland-test/257/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:297279d2251d0dbcd0c64f6568d07db28e196af3
https://jenkins.ubuntu.com/server/job/cloud-init-ci/783/
Executed test runs:
    SUCCESS: Checkout
    FAILED: Unit & Style Tests

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/783/rebuild

review: Needs Fixing (continuous-integration)

[Ryan Harper (raharper)]

This needs sorting out of the CI test failures on RedHat and OpenSuse distro variants. I'll look into that since I provided the unittest.

[Ryan Harper (raharper)]

Looks like the sysconfig renderer needs to accept 'static6' as well. This should fix this:

diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
index be5dede..686cd67 100644
--- a/cloudinit/net/sysconfig.py
+++ b/cloudinit/net/sysconfig.py
@@ -350,7 +350,7 @@ class Renderer(renderer.Renderer):
                 iface_cfg['DHCPV6C'] = True
             elif subnet_type in ['dhcp4', 'dhcp']:
                 iface_cfg['BOOTPROTO'] = 'dhcp'
- elif subnet_type == 'static':
+ elif subnet_type.startswith('static'):
                 # grep BOOTPROTO sysconfig.txt -A2 | head -3
                 # BOOTPROTO=none|bootp|dhcp
                 # 'bootp' or 'dhcp' cause a DHCP client
@@ -394,7 +394,7 @@ class Renderer(renderer.Renderer):
                 if has_default_route and iface_cfg['BOOTPROTO'] != 'none':
                     iface_cfg['DHCLIENT_SET_DEFAULT_ROUTE'] = False
                 continue
- elif subnet_type == 'static':
+ elif subnet_type.startswith('static'):
                 if subnet_is_ipv6(subnet):
                     ipv6_index = ipv6_index + 1
                     ipv6_cidr = "%s/%s" % (subnet['address'], subnet['prefix'])

review: Needs Fixing

Unmerged commits

297279d... by Raphaël Enrici on 2019-05-21

Adds test for ipv6 network/interfaces generation. (Patch Author: Ryan Harper <email address hidden>)

13c0339... by Raphaël Enrici on 2019-01-20

Replaces static6 by static as it is not a valid keyword in /etc/network/interfaces

diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index b129bb6..b4b232c 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -413,6 +413,8 @@ class Renderer(renderer.Renderer):
                 iface['inet'] = subnet_inet
                 if subnet['type'].startswith('dhcp'):
                     iface['mode'] = 'dhcp'
+                if subnet['type'].startswith('static6'):
+                    iface['mode'] = 'static'
 
                 # do not emit multiple 'auto $IFACE' lines as older (precise)
                 # ifupdown complains
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py
index c3c0c8c..03bbbc8 100644
--- a/tests/unittests/test_distros/test_netconfig.py
+++ b/tests/unittests/test_distros/test_netconfig.py
@@ -109,13 +109,31 @@ auto eth1
 iface eth1 inet dhcp
 """
 
+V1_NET_CFG_IPV6_OUTPUT = """\
+# This file is generated from information provided by
+# the datasource.  Changes to it will not persist across an instance.
+# To disable cloud-init's network configuration capabilities, write a file
+# /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg with the following:
+# network: {config: disabled}
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet6 static
+    address 2607:f0d0:1002:0011::2/64
+    gateway 2607:f0d0:1002:0011::1
+
+auto eth1
+iface eth1 inet dhcp
+"""
+
 V1_NET_CFG_IPV6 = {'config': [{'name': 'eth0',
                                'subnets': [{'address':
                                             '2607:f0d0:1002:0011::2',
                                             'gateway':
                                             '2607:f0d0:1002:0011::1',
                                             'netmask': '64',
-                                            'type': 'static'}],
+                                            'type': 'static6'}],
                                'type': 'physical'},
                               {'name': 'eth1',
                                'subnets': [{'control': 'auto',
@@ -376,6 +394,15 @@ class TestNetCfgDistroUbuntuEni(TestNetCfgDistroBase):
                                    V1_NET_CFG,
                                    expected_cfgs=expected_cfgs.copy())
 
+    def test_apply_network_config_ipv6_ub(self):
+        expected_cfgs = {
+            self.eni_path(): V1_NET_CFG_IPV6_OUTPUT
+        }
+        self._apply_and_verify_eni(self.distro.apply_network_config,
+                                   V1_NET_CFG_IPV6,
+                                   expected_cfgs=expected_cfgs.copy())
+
+
 
 class TestNetCfgDistroUbuntuNetplan(TestNetCfgDistroBase):
     def setUp(self):