Merge ~xnox/netplan:master into ~netplan-developers/netplan/+git/netplan-lp:master

[Dimitri John Ledkov]

Parse and set MACAdress on the vlan devices.

LP: #1690388

Parse and set MACAdress on the vlan devices.

LP: #1690388

[Martin Pitt (pitti)]

Looks good, but needs a unit test (make check ought to complain about/fail on < 100% coverage with this) and integration test. This doesn't supply an implementation with NetworkManager -- if that doesn't support it, it should trigger a warning at least.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

make check passed, but make coverage did not!

And NM does not support setting mac address for the vlan, at least in the keyfile plugin =(

[Mathieu Trudel-Lapierre (cyphermox)]

I already have code to do that, including the unit and integration tests. This should definitely not only be applied to VLANs.

review: Disapprove

[Dimitri John Ledkov (xnox)]

And added an integration test now too.

Oh, well even if this is duplicate code, I did familiarise myself with netplan code, unit and integration tests.

[Martin Pitt (pitti)]

Right, that looks good! However, not merging myself, please coordinate with Mathieu.

review: Approve

[Mathieu Trudel-Lapierre (cyphermox)]

I'll merge bits and bobs of it to improve the tests. The code is otherwise the same.

review: Approve

diff --git a/src/networkd.c b/src/networkd.c
index 04c7c37..817c3d2 100644
--- a/src/networkd.c
+++ b/src/networkd.c
@@ -177,6 +177,9 @@ write_netdev_file(net_definition* def, const char* rootdir, const char* path)
     s = g_string_sized_new(200);
     g_string_append_printf(s, "[NetDev]\nName=%s\n", def->id);
 
+    if (def->set_mac)
+	g_string_append_printf(s, "MACAddress=%s\n", def->set_mac);
+
     switch (def->type) {
         case ND_BRIDGE:
             g_string_append(s, "Kind=bridge\n");
diff --git a/src/parse.c b/src/parse.c
index 4312112..70ec084 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -970,6 +970,7 @@ const mapping_entry_handler vlan_def_handlers[] = {
     {"id", YAML_SCALAR_NODE, handle_netdef_guint, NULL, netdef_offset(vlan_id)},
     {"link", YAML_SCALAR_NODE, handle_netdef_id_ref, NULL, netdef_offset(vlan_link)},
     {"nameservers", YAML_MAPPING_NODE, NULL, nameservers_handlers},
+    {"macaddress", YAML_SCALAR_NODE, handle_netdef_mac, NULL, netdef_offset(set_mac)},
     {"mtu", YAML_SCALAR_NODE, handle_netdef_guint, NULL, netdef_offset(mtubytes)},
     {"renderer", YAML_SCALAR_NODE, handle_netdef_renderer},
     {"routes", YAML_SEQUENCE_NODE, handle_routes},
diff --git a/tests/generate.py b/tests/generate.py
index 542ad2f..1dc284a 100755
--- a/tests/generate.py
+++ b/tests/generate.py
@@ -1068,16 +1068,21 @@ Domains=lab kitchen
       id: 1
       link: en1
       addresses: [1.2.3.4/24]
+    enred:
+      id: 3
+      link: en1
+      macaddress: aa:bb:cc:dd:ee:11
     engreen: {id: 2, link: en1, dhcp6: true}''')
 
-        self.assert_networkd({'en1.network': '[Match]\nName=en1\n\n[Network]\nVLAN=enblue\nVLAN=engreen\n',
+        self.assert_networkd({'en1.network': '[Match]\nName=en1\n\n[Network]\nVLAN=engreen\nVLAN=enblue\nVLAN=enred\n',
                               'enblue.netdev': '[NetDev]\nName=enblue\nKind=vlan\n\n[VLAN]\nId=1\n',
                               'engreen.netdev': '[NetDev]\nName=engreen\nKind=vlan\n\n[VLAN]\nId=2\n',
+                              'enred.netdev': '[NetDev]\nName=enred\nMACAddress=aa:bb:cc:dd:ee:11\nKind=vlan\n\n[VLAN]\nId=3\n',
                               'enblue.network': '[Match]\nName=enblue\n\n[Network]\nAddress=1.2.3.4/24\n',
                               'engreen.network': ND_DHCP6 % 'engreen'})
         self.assert_nm(None, '''[keyfile]
 # devices managed by networkd
-unmanaged-devices+=interface-name:en1,interface-name:enblue,interface-name:engreen,''')
+unmanaged-devices+=interface-name:engreen,interface-name:en1,interface-name:enblue,interface-name:enred,''')
         self.assert_udev(None)
 
 
diff --git a/tests/integration.py b/tests/integration.py
index 68634c6..25dafa5 100755
--- a/tests/integration.py
+++ b/tests/integration.py
@@ -1483,6 +1483,27 @@ class TestNetworkd(NetworkTestBase, _CommonTests):
         with open('/sys/class/net/mybond/bonding/arp_validate') as f:
             self.assertEqual(f.read().strip(), 'all 3')
 
+    def test_vlan_mac_address(self):
+        self.setup_eth(None)
+        self.addCleanup(subprocess.call, ['ip', 'link', 'delete', 'myvlan'], stderr=subprocess.DEVNULL)
+        with open(self.config, 'w') as f:
+            f.write('''network:
+  renderer: %(r)s
+  ethernets:
+    ethbn:
+      match: {name: %(ec)s}
+    %(e2c)s: {}
+  vlans:
+    myvlan:
+      id: 101
+      link: ethbn
+      macaddress: aa:bb:cc:dd:ee:22
+        ''' % {'r': self.backend, 'ec': self.dev_e_client, 'e2c': self.dev_e2_client})
+        self.generate_and_settle()
+        self.assert_iface_up('myvlan', ['myvlan@' + self.dev_e_client])
+        with open('/sys/class/net/myvlan/address') as f:
+            self.assertEqual(f.read().strip(), 'aa:bb:cc:dd:ee:22')
+
 
 class TestNetworkManager(NetworkTestBase, _CommonTests):
     backend = 'NetworkManager'