From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/32] SDN VRF support
Date: Mon, 16 Nov 2026 17:11:20 +0100 [thread overview]
Message-ID: <20261116161154.343743-1-g.goller@proxmox.com> (raw)
This series adds VRF support to SDN zones and fabrics.
A simple zone can now use either the default VRF or a dedicated VRF. The
simple zone dialog has a checkbox for this and uses the default VRF by
default. If the checkbox is disabled, the zone creates a dedicated VRF named
`vrf_<zone-name>`. EVPN zones always create a dedicated VRF. BGP and OSPF
fabrics can select a zone and run inside its VRF.
This is the second iteration. The first iteration added VRFs as a separate
SDN object with a distinct GUI subdirectory. This was scrapped because VRFs
are an implementation detail and should not be exposed on their own in the
GUI. Zones already provide a logical L3 building block and should map to VRFs
instead.
Route leaking between VRFs partly depends on the following FRR change, so it
will come a bit later: https://github.com/FRRouting/frr/pull/22426
This version fixes DHCP (moving dnsmasq daemon to vrf) and the SNAT (adding
iptable rules with a zone id). Mostly I'd like these two things to be looked
at, as I'm not sure about the design.
As always, thanks to Stefan Hanreich for his help.
Changelog:
v2: (thanks @Stefan)
* allow interfaces to be added to vrfs
* allow static routes to be configured on vrfs
* fix ospf vrf statistics
* fix dhcp
* fix snat
RFC (v1):
* rebase
pve-common:
Gabriel Goller (1):
interfaces: preserve VRF membership across address family changes
src/PVE/Network/Interfaces.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
proxmox-ve-rs:
Gabriel Goller (7):
frr: add VRF-aware OSPF rendering
sdn: add zone references to OSPF and BGP fabrics
sdn: generate fabric routing configuration in zone VRFs
sdn: fix VRF route-map scoping and zone ID validation
tests: fabrics: add test for fabrics in VRFs
sdn: allow static routes in simple zone VRFs
sdn: support static routes in EVPN zone VRFs
proxmox-frr-templates/templates/bgpd.jinja | 7 +-
proxmox-frr-templates/templates/fabricd.jinja | 2 +-
.../templates/frr.conf.jinja | 3 +-
.../templates/interface.jinja | 6 +-
.../templates/ip_routes.jinja | 13 +-
proxmox-frr-templates/templates/isisd.jinja | 2 +-
proxmox-frr-templates/templates/ospfd.jinja | 12 +-
.../templates/protocol_routemaps.jinja | 13 +
proxmox-frr/src/ser/mod.rs | 33 ++-
proxmox-ve-config/src/sdn/fabric/frr.rs | 146 +++++++----
proxmox-ve-config/src/sdn/fabric/mod.rs | 40 ++-
.../src/sdn/fabric/section_config/fabric.rs | 29 ++-
.../sdn/fabric/section_config/protocol/bgp.rs | 11 +-
.../fabric/section_config/protocol/ospf.rs | 11 +-
proxmox-ve-config/src/sdn/mod.rs | 1 +
proxmox-ve-config/src/sdn/static_route.rs | 147 +++++++++++
.../tests/fabric/cfg/vrf/fabrics.cfg | 43 ++++
.../tests/fabric/cfg/vrf/route-maps.cfg | 15 ++
proxmox-ve-config/tests/fabric/helper.rs | 20 ++
proxmox-ve-config/tests/fabric/main.rs | 233 +++++++++++++++++-
.../fabric/snapshots/fabric__vrf_pve.snap | 134 ++++++++++
.../tests/static_routes/cfg/fabrics.cfg | 19 ++
.../tests/static_routes/cfg/zones.json | 20 ++
proxmox-ve-config/tests/static_routes/main.rs | 203 +++++++++++++++
...tatic_routes__evpn_zone_routes_to_frr.snap | 12 +
...c_routes__preserve_legacy_evpn_routes.snap | 12 +
...tatic_routes__simple_zone_routes_pve1.snap | 20 ++
...tatic_routes__simple_zone_routes_pve2.snap | 10 +
...outes__vrf_fabrics_with_static_routes.snap | 70 ++++++
29 files changed, 1215 insertions(+), 72 deletions(-)
create mode 100644 proxmox-ve-config/src/sdn/static_route.rs
create mode 100644 proxmox-ve-config/tests/fabric/cfg/vrf/fabrics.cfg
create mode 100644 proxmox-ve-config/tests/fabric/cfg/vrf/route-maps.cfg
create mode 100644 proxmox-ve-config/tests/fabric/snapshots/fabric__vrf_pve.snap
create mode 100644 proxmox-ve-config/tests/static_routes/cfg/fabrics.cfg
create mode 100644 proxmox-ve-config/tests/static_routes/cfg/zones.json
create mode 100644 proxmox-ve-config/tests/static_routes/main.rs
create mode 100644 proxmox-ve-config/tests/static_routes/snapshots/static_routes__evpn_zone_routes_to_frr.snap
create mode 100644 proxmox-ve-config/tests/static_routes/snapshots/static_routes__preserve_legacy_evpn_routes.snap
create mode 100644 proxmox-ve-config/tests/static_routes/snapshots/static_routes__simple_zone_routes_pve1.snap
create mode 100644 proxmox-ve-config/tests/static_routes/snapshots/static_routes__simple_zone_routes_pve2.snap
create mode 100644 proxmox-ve-config/tests/static_routes/snapshots/static_routes__vrf_fabrics_with_static_routes.snap
proxmox-perl-rs:
Gabriel Goller (5):
pve-rs: fabrics: assign network interfaces to configured VRFs
pve-rs: fabrics: make per-fabric status queries VRF-aware
pve-rs: fabrics: include VRF routes in aggregate status
pve-rs: fabrics: expose host interface membership
sdn: expose static routes for simple zone uplinks
pve-rs/src/bindings/sdn/fabrics.rs | 369 +++++++++++++++++++----------
pve-rs/src/bindings/sdn/mod.rs | 19 +-
pve-rs/src/sdn/status.rs | 149 +++++++++---
3 files changed, 389 insertions(+), 148 deletions(-)
pve-network:
Gabriel Goller (12):
sdn: evpn: add unreachable IPv6 default route to zone VRFs
sdn: add optional VRFs for simple zones
sdn: allow fabrics to use simple zone VRFs
sdn: require underlay fabrics to use the default VRF
sdn: always generate EVPN zone VRFs
api: sdn: allow EVPN zones as fabric VRFs
api: sdn: disallow BGP fabrics in EVPN zone VRFs
sdn: simple: support static routes in zone routing tables
sdn: evpn: allow static routes
sdn: zones: SNAT via dedicated uplinks in zone VRFs
sdn: dhcp: only configure DHCP for zones on the local node
sdn: dhcp: run dnsmasq in the zone VRF
src/PVE/API2/Network/SDN/Fabrics/Fabric.pm | 59 ++++-
.../API2/Network/SDN/Fabrics/FabricNode.pm | 18 ++
src/PVE/API2/Network/SDN/Zones.pm | 43 ++++
src/PVE/Network/SDN.pm | 23 +-
src/PVE/Network/SDN/Controllers/BgpPlugin.pm | 2 +-
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 2 +
src/PVE/Network/SDN/Dhcp.pm | 14 +-
src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 59 ++++-
src/PVE/Network/SDN/Fabrics.pm | 36 +++
src/PVE/Network/SDN/Zones.pm | 20 +-
src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 89 ++++---
src/PVE/Network/SDN/Zones/Plugin.pm | 229 +++++++++++++++++-
src/PVE/Network/SDN/Zones/SimplePlugin.pm | 79 ++++--
src/PVE/Network/SDN/Zones/VxlanPlugin.pm | 5 +
src/test/Makefile | 5 +-
src/test/run_test_static_routes.pl | 217 +++++++++++++++++
src/test/run_test_zones.pl | 4 +-
.../expected_controller_config | 6 +
.../advertise_subnets/expected_sdn_interfaces | 1 +
.../zones/evpn/advertise_subnets/sdn_config | 8 +-
.../evpn/auto_mode/expected_sdn_interfaces | 1 +
.../evpn/bgp_ebgp/expected_sdn_interfaces | 1 +
.../bgp_ebgp_multihop/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../evpn/bgp_fabric/expected_sdn_interfaces | 1 +
.../evpn/bgp_loopback/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../combined_bgp_isis/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../zones/evpn/ebgp/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 2 +
.../ebgp_loopback/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 2 +
.../evpn/exitnode/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../exitnode_primary/expected_sdn_interfaces | 1 +
.../exitnode_snat/expected_sdn_interfaces | 1 +
.../expected_controller_config | 79 ++++++
.../expected_sdn_interfaces | 73 ++++++
.../evpn/exitnode_snat_vrf_uplink/interfaces | 16 ++
.../evpn/exitnode_snat_vrf_uplink/sdn_config | 42 ++++
.../exitnodenullroute/expected_sdn_interfaces | 2 +
.../frr_local_merge/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../zones/evpn/ipv4/expected_sdn_interfaces | 1 +
.../evpn/ipv4ipv6/expected_sdn_interfaces | 1 +
.../ipv4ipv6nogateway/expected_sdn_interfaces | 1 +
.../zones/evpn/ipv6/expected_sdn_interfaces | 1 +
.../evpn/ipv6underlay/expected_sdn_interfaces | 1 +
.../zones/evpn/isis/expected_sdn_interfaces | 1 +
.../isis_loopback/expected_sdn_interfaces | 1 +
.../multipath_relax/expected_sdn_interfaces | 1 +
.../multiplezones/expected_sdn_interfaces | 2 +
.../openfabric_fabric/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../evpn/ospf_fabric/expected_sdn_interfaces | 1 +
.../evpn/routemap/expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../expected_sdn_interfaces | 1 +
.../evpn/rt_import/expected_sdn_interfaces | 1 +
.../evpn/vrf-empty/expected_sdn_interfaces | 7 +
src/test/zones/evpn/vrf-empty/interfaces | 2 +
src/test/zones/evpn/vrf-empty/sdn_config | 13 +
.../evpn/vxlanport/expected_sdn_interfaces | 1 +
.../hetzner-vrf/expected_sdn_interfaces | 27 +++
src/test/zones/simple/hetzner-vrf/interfaces | 6 +
src/test/zones/simple/hetzner-vrf/sdn_config | 34 +++
.../simple/vrf-empty/expected_sdn_interfaces | 7 +
src/test/zones/simple/vrf-empty/interfaces | 2 +
src/test/zones/simple/vrf-empty/sdn_config | 12 +
.../zones/simple/vrf/expected_sdn_interfaces | 14 ++
src/test/zones/simple/vrf/interfaces | 2 +
src/test/zones/simple/vrf/sdn_config | 17 ++
.../vrf_snat_uplink/expected_sdn_interfaces | 92 +++++++
.../zones/simple/vrf_snat_uplink/interfaces | 26 ++
.../zones/simple/vrf_snat_uplink/sdn_config | 84 +++++++
82 files changed, 1443 insertions(+), 78 deletions(-)
create mode 100644 src/test/run_test_static_routes.pl
create mode 100644 src/test/zones/evpn/exitnode_snat_vrf_uplink/expected_controller_config
create mode 100644 src/test/zones/evpn/exitnode_snat_vrf_uplink/expected_sdn_interfaces
create mode 100644 src/test/zones/evpn/exitnode_snat_vrf_uplink/interfaces
create mode 100644 src/test/zones/evpn/exitnode_snat_vrf_uplink/sdn_config
create mode 100644 src/test/zones/evpn/vrf-empty/expected_sdn_interfaces
create mode 100644 src/test/zones/evpn/vrf-empty/interfaces
create mode 100644 src/test/zones/evpn/vrf-empty/sdn_config
create mode 100644 src/test/zones/simple/hetzner-vrf/expected_sdn_interfaces
create mode 100644 src/test/zones/simple/hetzner-vrf/interfaces
create mode 100644 src/test/zones/simple/hetzner-vrf/sdn_config
create mode 100644 src/test/zones/simple/vrf-empty/expected_sdn_interfaces
create mode 100644 src/test/zones/simple/vrf-empty/interfaces
create mode 100644 src/test/zones/simple/vrf-empty/sdn_config
create mode 100644 src/test/zones/simple/vrf/expected_sdn_interfaces
create mode 100644 src/test/zones/simple/vrf/interfaces
create mode 100644 src/test/zones/simple/vrf/sdn_config
create mode 100644 src/test/zones/simple/vrf_snat_uplink/expected_sdn_interfaces
create mode 100644 src/test/zones/simple/vrf_snat_uplink/interfaces
create mode 100644 src/test/zones/simple/vrf_snat_uplink/sdn_config
proxmox-widget-toolkit:
Gabriel Goller (1):
ui: network: allow selecting a VRF for host interfaces
src/node/NetworkEdit.js | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
pve-manager:
Gabriel Goller (6):
ui: sdn: add VRF zone selection for fabrics
ui: sdn: expose EVPN zones as fabric VRFs
network: allow setting the VRF of host interfaces
ui: sdn: allow static routes for Simple zone VRFs
ui: sdn: allow static routes in EVPN zones
network: generate SDN DHCP config after ifreload
PVE/API2/Network.pm | 46 +++--
bin/pve-sdn-commit | 5 +-
www/manager6/Makefile | 1 +
www/manager6/Toolkit.js | 2 +-
www/manager6/form/SDNZoneSelector.js | 64 ++++++-
www/manager6/node/Config.js | 12 ++
www/manager6/sdn/StaticRoutes.js | 246 +++++++++++++++++++++++++
www/manager6/sdn/fabrics/FabricEdit.js | 18 ++
www/manager6/sdn/zones/Base.js | 40 +++-
www/manager6/sdn/zones/EvpnEdit.js | 2 +
www/manager6/sdn/zones/SimpleEdit.js | 11 ++
11 files changed, 429 insertions(+), 18 deletions(-)
create mode 100644 www/manager6/sdn/StaticRoutes.js
Summary over all repositories:
127 files changed, 3499 insertions(+), 317 deletions(-)
--
Generated by murpp 0.11.0
next reply other threads:[~2026-11-16 16:13 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 16:11 Gabriel Goller [this message]
2026-11-16 16:11 ` [PATCH pve-common v3 01/32] interfaces: preserve VRF membership across address family changes Gabriel Goller
2026-11-18 14:13 ` Stefan Hanreich
2026-11-18 15:41 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 02/32] frr: add VRF-aware OSPF rendering Gabriel Goller
2026-11-18 14:41 ` Stefan Hanreich
2026-11-18 16:21 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 03/32] sdn: add zone references to OSPF and BGP fabrics Gabriel Goller
2026-11-18 14:10 ` Stefan Hanreich
2026-11-18 16:55 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 04/32] sdn: generate fabric routing configuration in zone VRFs Gabriel Goller
2026-11-18 14:53 ` Stefan Hanreich
2026-11-18 17:26 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 05/32] sdn: fix VRF route-map scoping and zone ID validation Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 06/32] tests: fabrics: add test for fabrics in VRFs Gabriel Goller
2026-11-18 15:01 ` Stefan Hanreich
2026-11-18 17:33 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 07/32] sdn: allow static routes in simple zone VRFs Gabriel Goller
2026-11-18 15:29 ` Stefan Hanreich
2026-11-18 18:10 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 08/32] sdn: support static routes in EVPN " Gabriel Goller
2026-11-18 15:32 ` Stefan Hanreich
2026-11-19 13:12 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 09/32] pve-rs: fabrics: assign network interfaces to configured VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 10/32] pve-rs: fabrics: make per-fabric status queries VRF-aware Gabriel Goller
2026-11-18 15:42 ` Stefan Hanreich
2026-11-19 13:30 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 11/32] pve-rs: fabrics: include VRF routes in aggregate status Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 12/32] pve-rs: fabrics: expose host interface membership Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 13/32] sdn: expose static routes for simple zone uplinks Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 14/32] sdn: evpn: add unreachable IPv6 default route to zone VRFs Gabriel Goller
2026-11-18 16:08 ` Stefan Hanreich
2026-11-18 16:39 ` Stefan Hanreich
2026-11-19 13:38 ` Gabriel Goller
2026-11-19 15:51 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 15/32] sdn: add optional VRFs for simple zones Gabriel Goller
2026-11-18 16:18 ` Stefan Hanreich
2026-11-19 13:44 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 16/32] sdn: allow fabrics to use simple zone VRFs Gabriel Goller
2026-11-18 16:27 ` Stefan Hanreich
2026-11-19 14:14 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 17/32] sdn: require underlay fabrics to use the default VRF Gabriel Goller
2026-11-18 16:30 ` Stefan Hanreich
2026-11-19 14:33 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 18/32] sdn: always generate EVPN zone VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 19/32] api: sdn: allow EVPN zones as fabric VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 20/32] api: sdn: disallow BGP fabrics in EVPN zone VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 21/32] sdn: simple: support static routes in zone routing tables Gabriel Goller
2026-11-18 16:49 ` Stefan Hanreich
2026-11-19 14:53 ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 22/32] sdn: evpn: allow static routes Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 23/32] sdn: zones: SNAT via dedicated uplinks in zone VRFs Gabriel Goller
2026-11-18 18:07 ` Stefan Hanreich
2026-11-16 16:11 ` [PATCH pve-network v3 24/32] sdn: dhcp: only configure DHCP for zones on the local node Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 25/32] sdn: dhcp: run dnsmasq in the zone VRF Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-widget-toolkit v3 26/32] ui: network: allow selecting a VRF for host interfaces Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 27/32] ui: sdn: add VRF zone selection for fabrics Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 28/32] ui: sdn: expose EVPN zones as fabric VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 29/32] network: allow setting the VRF of host interfaces Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 30/32] ui: sdn: allow static routes for Simple zone VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 31/32] ui: sdn: allow static routes in EVPN zones Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 32/32] network: generate SDN DHCP config after ifreload Gabriel Goller
2026-11-18 18:27 ` [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/32] SDN VRF support Stefan Hanreich
2026-11-19 15:33 ` Gabriel Goller
2026-11-19 20:10 ` Gabriel Goller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261116161154.343743-1-g.goller@proxmox.com \
--to=g.goller@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox