bridges: implement vlans, port-vlans, vlan-filtering and vlan-default-pvid options

[p-strusiewiczsurmacki-mobica]

Description

This PR is a followup to #127 .

As described in #127:
Implements the vlans & port-vlans option keys for bridges, as required by the "NetworkManager readwrite plugin" spec. Currently only supports the nm backend.

I've rebased the old PR onto the current main and it seems to work OK (at least the tests are passing). Additionally added the vlan-filtering bool that can be forced true even if no vlans are defined (as described by @chdxD1 in this comment here.

Right now I am starting to work on networkd backend. However decided to create this draft PR to enable an early review and to just let others know that I am working on this.

I've added vlan-default-pvid to set default PVID for a bridge and networkd backend so i think the PR is ready. :)

make check-coverage fails for me in codestyle test within netplan/_build/meson-private/pycompile.py, which is Meson's file so I believe this is out of scope here, therefore checking make check-coverage in the checklist as passed.

I can also see that GitHub action NetworkManager Autopkgtest / lxd-network-manager is failing due to libc6-dev : Depends: libc6 (= 2.39-0ubuntu8.3) but 2.39-0ubuntu8.4 is to be installed but it also seems to be an issue with Ubuntu repositories I think. I think Ubuntu's repositories were fixed already.

Checklist

• Runs make check successfully.
• Retains code coverage (make check-coverage).
• New/changed keys in YAML format are documented.
• (Optional) Adds example YAML for new feature.
• (Optional) Closes an open bug in Launchpad.

[p-strusiewiczsurmacki-mobica]

Additional info: I've changed the code by @slyon a bit as it seems that for both NetworkManager and networkd only one PVID can be specified per interface. Networkd seems to specify this explicity in the docs. NetworkManager does not, but I've tried to configure multiple PVIDs with nmcli on Ubuntu 24.04 and it seems to not accept ranges. So I assume this is what is expected.

The PVID in networkd 'takes an VLAN ID or negative boolean value (e.g. "no")' - the 'negative boolean value' can be achieved with this PR by specifing vlans: [0 pvid] in the netplan configuration.

[Forst]

I wonder if it would be nicer to merge the implementations of vlans and port-vlans into one thing, rather than having one for bridge master and one for bridge ports. Then one would specify it at the interface level for both bridges and its ports, for example:

version: 2
renderer: ...
ethernets:
  eno1:
    vlans: [99 pvid untagged, 1 untagged]
  switchport:
    vlans: [4000-4094, 1 pvid, 13 untagged]
bridges:
  br0:
    interfaces: [eno1, switchport]
    vlans: [100 pvid untagged, 42 untagged, 13]
    parameters:
      vlan-filtering: true
      vlan-default-pvid: 123

That's the approach that networkd takes, where VLAN=, EgressUntagged= and PVID= are generically defined for both bridges and its ports in the [BridgeVLAN] section in systemd.network units.

In NetworkManager, the VLAN lists also go into the respective interface/connection files, albeit under different sections ([bridge] and [bridge-port]).

I do see, however, that there are already per-port bridge parameters in Netplan such as port-priority and path-cost, so your approach isn't new in that sense, other parameters did it that way before.

I don't have a strong opinion on this, but thought it'd bring it up, hopefully as a way to simplify things a little 🙂

[p-strusiewiczsurmacki-mobica]

Hi @Forst, I think that's a neat idea! However, I'll wait for an opinion from @slyon as this implementation is based on theirs after all.

[p-strusiewiczsurmacki-mobica]

Hi @slyon is it possible we could get this going?