From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-ve-rs v3 04/28] sdn: generate fabric routing configuration in zone VRFs
Date: Thu, 19 Nov 2026 20:40:50 +0100 [thread overview]
Message-ID: <20261119194116.575520-5-g.goller@proxmox.com> (raw)
In-Reply-To: <20261119194116.575520-1-g.goller@proxmox.com>
Map a fabric zone to the corresponding vrf_<zone> FRR instance. Generate
OSPF routers and interfaces in that VRF, and store BGP routers under the
same VRF name. Keep fabrics without a zone in the default routing table.
Collect OSPF redistribution rules on the router for the selected VRF so
that several fabrics in one VRF contribute to the same OSPF instance.
This keeps protocol configuration and interface configuration in the
routing table selected by the zone.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-ve-config/src/sdn/fabric/frr.rs | 71 +++++++++++++++----------
proxmox-ve-config/src/sdn/fabric/mod.rs | 10 ++++
2 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/proxmox-ve-config/src/sdn/fabric/frr.rs b/proxmox-ve-config/src/sdn/fabric/frr.rs
index 462ee72ad38e..ea042b2fea01 100644
--- a/proxmox-ve-config/src/sdn/fabric/frr.rs
+++ b/proxmox-ve-config/src/sdn/fabric/frr.rs
@@ -1,3 +1,4 @@
+use std::collections::{BTreeMap, btree_map};
use std::net::{IpAddr, Ipv4Addr};
use tracing;
@@ -18,6 +19,7 @@ use proxmox_sdn_types::net::Net;
use crate::common::valid::Valid;
+use crate::sdn::ZoneName;
use crate::sdn::fabric::section_config::protocol::bgp::{BgpNode, bgp_router_id};
use crate::sdn::fabric::section_config::protocol::{
bgp::BgpRedistributionSource,
@@ -27,7 +29,7 @@ use crate::sdn::fabric::section_config::protocol::{
use crate::sdn::fabric::section_config::{fabric::FabricId, node::NodeId};
use crate::sdn::fabric::{FabricConfig, FabricEntry};
-/// Constructs the FRR config from the the passed [`Valid<FabricConfig>`].
+/// Constructs the FRR config from the passed [`Valid<FabricConfig>`].
///
/// Iterates over the [`FabricConfig`] and constructs all the FRR routers, interfaces, route-maps,
/// etc.
@@ -37,7 +39,9 @@ pub fn build_fabric(
frr_config: &mut FrrConfig,
) -> Result<(), anyhow::Error> {
let mut routemap_seq = 100;
- let mut current_router_id: Option<Ipv4Addr> = None;
+ // OSPF router IDs only need to be unique within a VRF, and node addresses are only unique
+ // within a VRF, so pick the router ID per VRF.
+ let mut ospf_router_ids: BTreeMap<VrfName, Ipv4Addr> = BTreeMap::new();
let mut current_net: Option<Net> = None;
for (fabric_id, entry) in config.into_inner().iter() {
@@ -199,34 +203,37 @@ pub fn build_fabric(
continue;
};
- let router_id = current_router_id
- .get_or_insert(node.ip().expect("node must have an ipv4 address"));
-
let fabric = ospf_entry.fabric_section();
+ let vrf_name = fabric_vrf_name(fabric.properties().zone())?;
+
+ let router_id = ospf_router_ids
+ .entry(vrf_name.clone())
+ .or_insert(node.ip().expect("node must have an ipv4 address"));
let frr_word_area = ser::FrrWord::new(fabric.properties().area.to_string())?;
let frr_area = ser::ospf::Area::new(frr_word_area)?;
- if !frr_config.ospf.vrf_router.contains_key(&VrfName::Default) {
- let mut ospf_router = build_ospf_router(*router_id)?;
-
- ospf_router.redistribute = fabric
- .properties()
- .redistributions()
- .into_iter()
- .cloned()
- .map(OspfRedistribution::from)
- .collect();
+ let redistributions = fabric
+ .properties()
+ .redistributions()
+ .into_iter()
+ .cloned()
+ .map(OspfRedistribution::from);
+
+ let ospf_router = match frr_config.ospf.vrf_router.entry(vrf_name.clone()) {
+ btree_map::Entry::Occupied(entry) => entry.into_mut(),
+ btree_map::Entry::Vacant(entry) => entry.insert(build_ospf_router(*router_id)?),
+ };
+ ospf_router.redistribute.extend(redistributions);
- frr_config
- .ospf
- .vrf_router
- .insert(VrfName::Default, ospf_router);
- }
+ let interface_vrf = match &vrf_name {
+ VrfName::Default => None,
+ custom => Some(custom.clone()),
+ };
// Add dummy interface
let (interface, interface_name) =
- build_ospf_dummy_interface(fabric_id, frr_area.clone())?;
+ build_ospf_dummy_interface(fabric_id, frr_area.clone(), interface_vrf.clone())?;
if frr_config
.ospf
@@ -241,7 +248,7 @@ pub fn build_fabric(
for interface in node.properties().interfaces.iter() {
let (interface, interface_name) =
- build_ospf_interface(frr_area.clone(), interface)?;
+ build_ospf_interface(frr_area.clone(), interface, interface_vrf.clone())?;
if frr_config
.ospf
@@ -308,6 +315,7 @@ pub fn build_fabric(
};
let fabric = bgp_entry.fabric_section();
+ let vrf_name = fabric_vrf_name(fabric.properties().zone())?;
let local_asn = properties.asn().as_u32();
@@ -322,7 +330,7 @@ pub fn build_fabric(
let local_as = frr_config
.bgp
.vrf_router
- .get(&VrfName::Default)
+ .get(&vrf_name)
.filter(|existing| existing.asn != local_asn)
.map(|_| LocalAsSettings {
asn: local_asn,
@@ -557,10 +565,10 @@ pub fn build_fabric(
custom_frr_config: Default::default(),
};
- if let Some(existing) = frr_config.bgp.vrf_router.get_mut(&VrfName::Default) {
+ if let Some(existing) = frr_config.bgp.vrf_router.get_mut(&vrf_name) {
existing.merge_fabric(router);
} else {
- frr_config.bgp.vrf_router.insert(VrfName::Default, router);
+ frr_config.bgp.vrf_router.insert(vrf_name, router);
}
}
}
@@ -590,6 +598,13 @@ pub fn build_fabric(
Ok(())
}
+fn fabric_vrf_name(zone: Option<&ZoneName>) -> Result<VrfName, ser::FrrWordError> {
+ Ok(match zone {
+ Some(zone) => VrfName::Custom(FrrWord::new(format!("vrf_{zone}"))?),
+ None => VrfName::Default,
+ })
+}
+
/// Helper that builds a OSPF router with a the router_id.
fn build_ospf_router(router_id: Ipv4Addr) -> Result<OspfRouter, anyhow::Error> {
Ok(OspfRouter::new(router_id))
@@ -610,6 +625,7 @@ fn build_openfabric_router(
fn build_ospf_interface(
area: ser::ospf::Area,
interface: &OspfInterfaceProperties,
+ vrf: Option<VrfName>,
) -> Result<(Interface<OspfInterface>, InterfaceName), anyhow::Error> {
let frr_interface = ser::ospf::OspfInterface {
area,
@@ -625,7 +641,7 @@ fn build_ospf_interface(
}
Some(network_type) => Some(network_type),
},
- vrf: None,
+ vrf,
};
let interface_name = interface.name.as_ref().try_into()?;
@@ -636,12 +652,13 @@ fn build_ospf_interface(
fn build_ospf_dummy_interface(
fabric_id: &FabricId,
area: ospf::Area,
+ vrf: Option<VrfName>,
) -> Result<(Interface<OspfInterface>, InterfaceName), anyhow::Error> {
let frr_interface = ser::ospf::OspfInterface {
area,
passive: Some(true),
network_type: None,
- vrf: None,
+ vrf,
};
let interface_name = format!("dummy_{}", fabric_id).try_into()?;
Ok((frr_interface.into(), interface_name))
diff --git a/proxmox-ve-config/src/sdn/fabric/mod.rs b/proxmox-ve-config/src/sdn/fabric/mod.rs
index ae74b981f285..9915ebdf7a3f 100644
--- a/proxmox-ve-config/src/sdn/fabric/mod.rs
+++ b/proxmox-ve-config/src/sdn/fabric/mod.rs
@@ -541,6 +541,16 @@ impl FabricEntry {
FabricEntry::Bgp(entry) => &mut entry.fabric,
}
}
+
+ pub fn fabric_vrf_name(&self) -> Option<String> {
+ let zone = match self {
+ FabricEntry::Ospf(entry) => entry.fabric_section().properties().zone(),
+ FabricEntry::Bgp(entry) => entry.fabric_section().properties().zone(),
+ FabricEntry::Openfabric(_) | FabricEntry::WireGuard(_) => None,
+ };
+
+ zone.map(|zone| format!("vrf_{zone}"))
+ }
}
impl From<Fabric> for FabricEntry {
--
2.47.3
next prev parent reply other threads:[~2026-11-19 19:41 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-19 19:40 [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/28] SDN VRF support Gabriel Goller
2026-11-19 19:40 ` [PATCH pve-common v3 01/28] interfaces: preserve VRF membership across address family changes Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 02/28] frr: add VRF-aware OSPF rendering Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 03/28] sdn: add zone references to OSPF and BGP fabrics Gabriel Goller
2026-11-19 19:40 ` Gabriel Goller [this message]
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 05/28] sdn: fix VRF route-map scoping and zone ID validation Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 06/28] tests: fabrics: add tests for fabrics in VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-ve-rs v3 07/28] sdn: allow static routes in simple zone VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 08/28] pve-rs: fabrics: assign network interfaces to configured VRFs Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 09/28] pve-rs: fabrics: make per-fabric status queries VRF-aware Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 10/28] pve-rs: fabrics: include VRF routes in aggregate status Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 11/28] pve-rs: fabrics: expose host interface membership Gabriel Goller
2026-11-19 19:40 ` [PATCH proxmox-perl-rs v3 12/28] sdn: expose static routes for simple zone uplinks Gabriel Goller
2026-11-19 19:40 ` [PATCH pve-network v3 13/28] sdn: evpn: add unreachable IPv6 default route to zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 14/28] sdn: add optional VRFs for simple zones Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 15/28] sdn: allow fabrics to use simple zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 16/28] sdn: require underlay fabrics to use the default VRF Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 17/28] sdn: move full range CIDR formats into a separate module Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 18/28] sdn: simple: support static routes in zone routing tables Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 19/28] sdn: dhcp: only configure DHCP for zones on the local node Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 20/28] sdn: dhcp: run dnsmasq in the zone VRF Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 21/28] sdn: dhcp: fix DNS server option for IPv4 subnets without gateway Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-network v3 22/28] sdn: evpn: no exit node null routes for simple zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH proxmox-widget-toolkit v3 23/28] ui: network: allow selecting a VRF for host interfaces Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 24/28] ui: sdn: add VRF zone selection for fabrics Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 25/28] network: allow setting the VRF of host interfaces Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 26/28] ui: sdn: allow static routes for Simple zone VRFs Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 27/28] network: generate SDN DHCP config after ifreload Gabriel Goller
2026-11-19 19:41 ` [PATCH pve-manager v3 28/28] ui: sdn: subnet: allow setting the DHCP DNS server 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=20261119194116.575520-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.