Merge ~wesley-wiedenmeier/cloud-init:net-update into cloud-init:master

[Wesley Wiedenmeier]

Update unit tests for network and make minor updates to network features based on curtin.net

[Scott Moser (smoser)]

We now have better test coverage in cloud-init including the multiple addresses
for both ipv4 and ipv6 and ENI rendering.

the only thing left is 'hwaddress ether'.
And everything I read in interfaces(5) does not idnicate 'ether' is needed.
also, we do support *reading* ENI that has 'hwadress ether', but unless there is an example of why we need this, i think its best to ignore that part for now.

so i'm going to mark this 'rejected'. I hate how harsh that word sounds.
please feel free to re-submit and justfify.

[Scott Moser (smoser)]

We now have better test coverage in cloud-init including the multiple addresses
for both ipv4 and ipv6 and ENI rendering.

the only thing left is 'hwaddress ether'.
And everything I read in interfaces(5) does not idnicate 'ether' is needed.
also, we do support *reading* ENI that has 'hwadress ether', but unless there is an example of why we need this, i think its best to ignore that part for now.

so i'm going to mark this 'rejected'. I hate how harsh that word sounds.
please feel free to re-submit and justfify.

Unmerged commits

7fe4c44... by Wesley Wiedenmeier on 2017-02-06

Substitute 'hwaddress ether' rather than 'hwaddress' for 'mac_address'

56a288b... by Wesley Wiedenmeier on 2017-01-31

Updated networking unit tests based on newer curtin tests

 - add test for ipv6 aliases
 - add tests for multiple ipv4 aliases
 - substitution for mac_address should be 'hwaddress ether', not hwaddress

diff --git a/cloudinit/net/eni.py b/cloudinit/net/eni.py
index 5b249f1..6bee905 100644
--- a/cloudinit/net/eni.py
+++ b/cloudinit/net/eni.py
@@ -74,7 +74,7 @@ def _iface_add_attrs(iface, index):
         'subnets',
         'type',
     ]
-    renames = {'mac_address': 'hwaddress'}
+    renames = {'mac_address': 'hwaddress ether'}
     if iface['type'] not in ['bond', 'bridge', 'vlan']:
         ignore_map.append('mac_address')
 
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index b77d277..c3a675e 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -280,6 +280,67 @@ NETWORK_CONFIGS = {
                 - {'type': 'dhcp6'}
         """).rstrip(' '),
     },
+    'ipv6_aliases': {
+        'expected_eni': textwrap.dedent("""\
+            auto lo
+            iface lo inet loopback
+
+            auto eth0
+            iface eth0 inet6 static
+                address fde9:8f83:4a81:1:0:1:0:6/64
+
+            # control-alias eth0
+            iface eth0 inet static
+                address 192.168.0.1/24
+        """).rstrip(' '),
+        'yaml': textwrap.dedent("""\
+            version: 1
+            config:
+              - 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
+        """).rstrip(' '),
+    },
+    'ipv4_multiple_aliases': {
+        'expected_eni': textwrap.dedent("""\
+            auto lo
+            iface lo inet loopback
+
+            auto interface1
+            iface interface1 inet dhcp
+
+            # control-alias interface1
+            iface interface1 inet static
+                address 192.168.2.2/22
+                gateway 192.168.2.1
+
+            # control-alias interface1
+            iface interface1 inet static
+                address 10.23.23.7/23
+                gateway 10.23.23.1
+        """).rstrip(' '),
+        'yaml': textwrap.dedent("""\
+            version: 1
+            config:
+              # multi_v4_aliases: multiple v4 addrs on same interface
+              - type: physical
+                name: interface1
+                mac_address: "52:54:00:12:34:02"
+                subnets:
+                    - type: dhcp
+                    - type: static
+                      address: 192.168.2.2/22
+                      gateway: 192.168.2.1
+                    - type: static
+                      address: 10.23.23.7/23
+                      gateway: 10.23.23.1
+        """).rstrip(' '),
+    },
     'all': {
         'expected_eni': ("""\
 auto lo
@@ -310,7 +371,7 @@ auto bond0
 iface bond0 inet6 dhcp
     bond-mode active-backup
     bond-slaves none
-    hwaddress aa:bb:cc:dd:ee:ff
+    hwaddress ether aa:bb:cc:dd:ee:ff
 
 auto br0
 iface br0 inet static
@@ -780,6 +841,20 @@ class TestEniRoundTrip(CiTestCase):
             entry['expected_eni'].splitlines(),
             files['/etc/network/interfaces'].splitlines())
 
+    def testsimple_render_interfaces_ipv6_aliases(self):
+        entry = NETWORK_CONFIGS['ipv6_aliases']
+        files = self._render_and_read(network_config=yaml.load(entry['yaml']))
+        self.assertEqual(
+            entry['expected_eni'].splitlines(),
+            files['/etc/network/interfaces'].splitlines())
+
+    def testsimple_render_interfaces_ipv4_multiple_aliases(self):
+        entry = NETWORK_CONFIGS['ipv4_multiple_aliases']
+        files = self._render_and_read(network_config=yaml.load(entry['yaml']))
+        self.assertEqual(
+            entry['expected_eni'].splitlines(),
+            files['/etc/network/interfaces'].splitlines())
+
     def test_routes_rendered(self):
         # as reported in bug 1649652
         conf = [