Merge ~xnox/cloud-init:vlan-macaddress into cloud-init:master

[Dimitri John Ledkov]

netplan: pass macaddress, when specified, for vlans

LP: #1690388

netplan: pass macaddress, when specified, for vlans

LP: #1690388

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

PASSED: Continuous integration, rev:e0f16a866a293ea82b42012f020f361a60944206
https://jenkins.ubuntu.com/server/job/cloud-init-ci/334/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/334
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/334
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/334
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/334

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

review: Approve (continuous-integration)

[Ryan Harper (raharper)]

We should update the netplan unittest to include a vlan mac_address.

[Scott Moser (smoser)]

Can you
a.) add a unit test
b.) attach the network_json that you had in your openstack instance to the bug.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

b) attached network_json to the bug report as is.

[Dimitri John Ledkov (xnox)]

* xnox recommends to use "physical_address" for MAC in v3 yaml

[Dimitri John Ledkov (xnox)]

test added. bot should test this soon.

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

PASSED: Continuous integration, rev:7ffcb99f599216e69d6efc76b4dbccc909e45755
https://jenkins.ubuntu.com/server/job/cloud-init-ci/357/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/357
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/357
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/357
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/357

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

review: Approve (continuous-integration)

diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
index 56b41be..9b71de9 100644
--- a/cloudinit/net/netplan.py
+++ b/cloudinit/net/netplan.py
@@ -345,7 +345,9 @@ class Renderer(renderer.Renderer):
                     'id': ifcfg.get('vlan_id'),
                     'link': ifcfg.get('vlan-raw-device')
                 }
-
+                macaddr = ifcfg.get('mac_address', None)
+                if macaddr is not None:
+                    vlan['macaddress'] = macaddr.lower()
                 _extract_addresses(ifcfg, vlan)
                 vlans.update({ifname: vlan})
 
diff --git a/tests/unittests/test_net.py b/tests/unittests/test_net.py
index d36d0e7..68a0157 100644
--- a/tests/unittests/test_net.py
+++ b/tests/unittests/test_net.py
@@ -558,6 +558,7 @@ iface eth0.101 inet static
     dns-nameservers 192.168.0.10 10.23.23.134
     dns-search barley.maas sacchromyces.maas brettanomyces.maas
     gateway 192.168.0.1
+    hwaddress aa:bb:cc:dd:ee:11
     mtu 1500
     vlan-raw-device eth0
     vlan_id 101
@@ -680,6 +681,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                         gateway4: 192.168.0.1
                         id: 101
                         link: eth0
+                        macaddress: aa:bb:cc:dd:ee:11
                         nameservers:
                             addresses:
                             - 192.168.0.10
@@ -723,6 +725,7 @@ pre-down route del -net 10.0.0.0 netmask 255.0.0.0 gw 11.0.0.1 metric 3 || true
                   name: eth0.101
                   vlan_link: eth0
                   vlan_id: 101
+                  mac_address: aa:bb:cc:dd:ee:11
                   mtu: 1500
                   subnets:
                     - type: static