public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: Re: [PATCH proxmox-ve-rs v3 06/32] tests: fabrics: add test for fabrics in VRFs
Date: Wed, 18 Nov 2026 16:01:05 +0100	[thread overview]
Message-ID: <f5acd550-4497-4f66-aebc-0305052dd8ca@proxmox.com> (raw)
In-Reply-To: <20261116161154.343743-7-g.goller@proxmox.com>

I can think of a few additional scenarios worth testing:

* add a fabric in the default VRF
* redistributions
* route filters enabled
* IPv6

On 11/16/26 5:13 PM, Gabriel Goller wrote:
> Add an integration test covering OSPF and BGP fabrics assigned to
> multiple SDN zone VRFs.
> 
> Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
> ---
>  .../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        | 115 +++++++++++++--
>  .../fabric/snapshots/fabric__vrf_pve.snap     | 134 ++++++++++++++++++
>  5 files changed, 314 insertions(+), 13 deletions(-)
>  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
> 
> diff --git a/proxmox-ve-config/tests/fabric/cfg/vrf/fabrics.cfg b/proxmox-ve-config/tests/fabric/cfg/vrf/fabrics.cfg
> new file mode 100644
> index 000000000000..05a1cb57642a
> --- /dev/null
> +++ b/proxmox-ve-config/tests/fabric/cfg/vrf/fabrics.cfg
> @@ -0,0 +1,43 @@
> +ospf_fabric: ospfred
> +        area 0
> +        ip_prefix 10.0.0.0/24
> +        zone red
> +
> +ospf_fabric: ospfblue
> +        area 0
> +        ip_prefix 10.0.0.0/24
> +        zone blue
> +
> +ospf_node: ospfred_pve
> +        interfaces name=ens18
> +        ip 10.0.0.1
> +
> +ospf_node: ospfblue_pve
> +        interfaces name=ens19
> +        ip 10.0.0.1
> +
> +bgp_fabric: bgpred
> +        bfd 0
> +        ip_prefix 10.1.0.0/24
> +        route_map_in red-in
> +        route_map_out red-out
> +        zone red
> +
> +bgp_fabric: bgpblue
> +        bfd 0
> +        ip_prefix 10.1.0.0/24
> +        route_map_in blue-in
> +        route_map_out blue-out
> +        zone blue
> +
> +bgp_node: bgpred_pve
> +        asn 65001
> +        interfaces name=ens20
> +        ip 10.1.0.1
> +        role internal
> +
> +bgp_node: bgpblue_pve
> +        asn 65002
> +        interfaces name=ens21
> +        ip 10.1.0.1
> +        role internal
> diff --git a/proxmox-ve-config/tests/fabric/cfg/vrf/route-maps.cfg b/proxmox-ve-config/tests/fabric/cfg/vrf/route-maps.cfg
> new file mode 100644
> index 000000000000..b382fc369b51
> --- /dev/null
> +++ b/proxmox-ve-config/tests/fabric/cfg/vrf/route-maps.cfg
> @@ -0,0 +1,15 @@
> +route-map-entry: blue-in_10
> +        action permit
> +        set key=local-preference,value=200
> +
> +route-map-entry: blue-out_10
> +        action permit
> +        set key=metric,value=20
> +
> +route-map-entry: red-in_10
> +        action permit
> +        set key=local-preference,value=100
> +
> +route-map-entry: red-out_10
> +        action permit
> +        set key=metric,value=10
> diff --git a/proxmox-ve-config/tests/fabric/helper.rs b/proxmox-ve-config/tests/fabric/helper.rs
> index 93404b8eb7af..ec464d334a4c 100644
> --- a/proxmox-ve-config/tests/fabric/helper.rs
> +++ b/proxmox-ve-config/tests/fabric/helper.rs
> @@ -18,6 +18,24 @@ macro_rules! get_fabrics_config {
>      }};
>  }
>  
> +#[allow(unused_macros)]
> +macro_rules! get_route_maps_config {
> +    () => {{
> +        fn f() {}
> +        fn type_name_of<T>(_: T) -> &'static str {
> +            std::any::type_name::<T>()
> +        }
> +        let mut name = type_name_of(f);
> +
> +        name = match &name[..name.len() - 3].rfind(':') {
> +            Some(pos) => &name[pos + 1..name.len() - 3],
> +            None => &name[..name.len() - 3],
> +        };
> +        let real_filename = format!("tests/fabric/cfg/{name}/route-maps.cfg");
> +        &std::fs::read_to_string(real_filename).expect("cannot find route-map config file")
> +    }};
> +}
> +
>  #[allow(unused_macros)]
>  macro_rules! reference_name {
>      ($suffix:expr) => {{
> @@ -40,4 +58,6 @@ macro_rules! reference_name {
>  #[allow(unused_imports)]
>  pub(crate) use get_fabrics_config;
>  #[allow(unused_imports)]
> +pub(crate) use get_route_maps_config;
> +#[allow(unused_imports)]
>  pub(crate) use reference_name;
> diff --git a/proxmox-ve-config/tests/fabric/main.rs b/proxmox-ve-config/tests/fabric/main.rs
> index 05210000adf5..de83eb3425a7 100644
> --- a/proxmox-ve-config/tests/fabric/main.rs
> +++ b/proxmox-ve-config/tests/fabric/main.rs
> @@ -3,15 +3,21 @@ use std::net::Ipv4Addr;
>  use std::str::FromStr;
>  
>  use proxmox_frr::ser::bgp::{AddressFamilies, BgpRouter, CommonAddressFamilyOptions, L2vpnEvpnAF};
> -use proxmox_frr::ser::route_map::RouteMapName;
> -use proxmox_frr::ser::{FrrConfig, FrrProtocol, FrrWord, VrfName, serializer::dump};
> -use proxmox_ve_config::sdn::fabric::{
> -    FabricConfig,
> -    frr::build_fabric,
> -    section_config::{
> -        fabric::{FabricId, FabricUpdater},
> -        node::NodeId,
> +use proxmox_frr::ser::route_map::{AccessAction, RouteMapEntry, RouteMapName};
> +use proxmox_frr::ser::{
> +    FrrConfig, FrrProtocol, FrrWord, IpProtocolRouteMap, VrfName, serializer::dump,
> +};
> +use proxmox_section_config::typed::ApiSectionDataEntry;
> +use proxmox_ve_config::sdn::{
> +    fabric::{
> +        FabricConfig,
> +        frr::build_fabric,
> +        section_config::{
> +            fabric::{FabricId, FabricUpdater},
> +            node::NodeId,
> +        },
>      },
> +    route_map::{RouteMap, frr::build_frr_route_maps},
>  };
>  
>  mod helper;
> @@ -274,9 +280,31 @@ bgp_node: bgp_pve
>  "#;
>      let config = FabricConfig::parse_section_config(raw).unwrap();
>      let mut frr_config = FrrConfig::default();
> +    let correct_src = RouteMapName::new("correct_src").unwrap();
> +    let correct_src_entry = RouteMapEntry {
> +        seq: 1,
> +        action: AccessAction::Permit,
> +        matches: Vec::new(),
> +        sets: Vec::new(),
> +        custom_frr_config: Vec::new(),
> +        call: None,
> +        exit_action: None,
> +    };
> +    frr_config
> +        .routemaps
> +        .insert(correct_src.clone(), vec![correct_src_entry.clone()]);
> +    frr_config.protocol_routemaps.insert(
> +        FrrProtocol::Bgp,
> +        IpProtocolRouteMap {
> +            v4: Some(correct_src.clone()),
> +            v6: None,
> +        },
> +    );
>  
>      build_fabric(NodeId::from_str("pve").unwrap(), config, &mut frr_config).unwrap();
>  
> +    assert_eq!(frr_config.routemaps[&correct_src], vec![correct_src_entry]);
> +
>      let ospf_routemap = &frr_config.vrf_protocol_routemaps
>          [&VrfName::Custom(FrrWord::new("vrf_zoneone").unwrap())][&FrrProtocol::Ospf];
>      assert_eq!(
> @@ -295,14 +323,75 @@ bgp_node: bgp_pve
>              .get(&FrrProtocol::Ospf)
>              .is_none()
>      );
> -    assert!(
> -        frr_config
> -            .protocol_routemaps
> -            .get(&FrrProtocol::Bgp)
> -            .is_none()
> +    assert_eq!(
> +        frr_config.protocol_routemaps[&FrrProtocol::Bgp].v4,
> +        Some(correct_src)
>      );
>  }
>  
> +#[test]
> +fn ospf_router_id_is_selected_per_vrf() {
> +    let raw = r#"
> +ospf_fabric: red
> +        area 0
> +        ip_prefix 10.0.0.0/24
> +        zone red
> +
> +ospf_node: red_pve
> +        interfaces name=eth0
> +        ip 10.0.0.1
> +
> +ospf_fabric: blue
> +        area 0
> +        ip_prefix 10.0.0.0/24
> +        zone blue
> +
> +ospf_node: blue_pve
> +        interfaces name=eth1
> +        ip 10.0.0.2
> +
> +ospf_node: blue_pve2
> +        interfaces name=eth1
> +        ip 10.0.0.1
> +"#;
> +    let config = FabricConfig::parse_section_config(raw).unwrap();
> +    let mut frr_config = FrrConfig::default();
> +
> +    build_fabric(NodeId::from_str("pve").unwrap(), config, &mut frr_config).unwrap();
> +
> +    let router_id = |vrf: &str| {
> +        frr_config.ospf.vrf_router[&VrfName::Custom(FrrWord::new(vrf).unwrap())].router_id
> +    };
> +    assert_eq!(router_id("vrf_red"), Ipv4Addr::new(10, 0, 0, 1));
> +    assert_eq!(router_id("vrf_blue"), Ipv4Addr::new(10, 0, 0, 2));
> +}
> +
> +#[test]
> +fn vrf() {
> +    let config = FabricConfig::parse_section_config(helper::get_fabrics_config!()).unwrap();
> +    let route_maps =
> +        RouteMap::parse_section_config("route-maps.cfg", helper::get_route_maps_config!()).unwrap();
> +    let mut frr_config = FrrConfig::default();
> +
> +    build_frr_route_maps(
> +        route_maps
> +            .into_iter()
> +            .map(|(_, route_map_entry)| route_map_entry),
> +        &mut frr_config,
> +    )
> +    .unwrap();
> +    build_fabric(
> +        NodeId::from_str("pve").expect("invalid nodeid"),
> +        config,
> +        &mut frr_config,
> +    )
> +    .unwrap();
> +
> +    let output = dump(&frr_config).expect("error dumping stuff");
> +
> +    insta::assert_snapshot!(helper::reference_name!("pve"), output);
> +}
> +
>  #[test]
>  fn bgp_default() {
>      let config = FabricConfig::parse_section_config(helper::get_fabrics_config!()).unwrap();
> diff --git a/proxmox-ve-config/tests/fabric/snapshots/fabric__vrf_pve.snap b/proxmox-ve-config/tests/fabric/snapshots/fabric__vrf_pve.snap
> new file mode 100644
> index 000000000000..84973240deb4
> --- /dev/null
> +++ b/proxmox-ve-config/tests/fabric/snapshots/fabric__vrf_pve.snap
> @@ -0,0 +1,134 @@
> +---
> +source: proxmox-ve-config/tests/fabric/main.rs
> +expression: output
> +---
> +!
> +router bgp 65002 vrf vrf_blue
> + bgp router-id 10.1.0.1
> + no bgp default ipv4-unicast
> + neighbor bgpblue peer-group
> + neighbor bgpblue remote-as external
> + neighbor ens21 interface peer-group bgpblue
> + !
> + address-family ipv4 unicast
> +  network 10.1.0.1/32
> +  neighbor bgpblue activate
> +  neighbor bgpblue soft-reconfiguration inbound
> +  neighbor bgpblue route-map pve_bgp_bgpblue_in in
> +  neighbor bgpblue route-map blue-out out
> + exit-address-family
> +exit
> +!
> +router bgp 65001 vrf vrf_red
> + bgp router-id 10.1.0.1
> + no bgp default ipv4-unicast
> + neighbor bgpred peer-group
> + neighbor bgpred remote-as external
> + neighbor ens20 interface peer-group bgpred
> + !
> + address-family ipv4 unicast
> +  network 10.1.0.1/32
> +  neighbor bgpred activate
> +  neighbor bgpred soft-reconfiguration inbound
> +  neighbor bgpred route-map pve_bgp_bgpred_in in
> +  neighbor bgpred route-map red-out out
> + exit-address-family
> +exit
> +!
> +router ospf vrf vrf_blue
> + ospf router-id 10.0.0.1
> +exit
> +!
> +router ospf vrf vrf_red
> + ospf router-id 10.0.0.1
> +exit
> +!
> +interface dummy_ospfblue vrf vrf_blue
> + ip ospf area 0
> + ip ospf passive
> +exit
> +!
> +interface dummy_ospfred vrf vrf_red
> + ip ospf area 0
> + ip ospf passive
> +exit
> +!
> +interface ens18 vrf vrf_red
> + ip ospf area 0
> + ip ospf network point-to-point
> +exit
> +!
> +interface ens19 vrf vrf_blue
> + ip ospf area 0
> + ip ospf network point-to-point
> +exit
> +!
> +access-list pve_bgp_bgpblue_ips permit 10.1.0.0/24
> +!
> +access-list pve_bgp_bgpred_ips permit 10.1.0.0/24
> +!
> +access-list pve_ospf_ospfblue_ips permit 10.0.0.0/24
> +!
> +access-list pve_ospf_ospfred_ips permit 10.0.0.0/24
> +!
> +route-map blue-in permit 10
> + set local-preference 200
> +exit
> +!
> +route-map blue-out permit 10
> + set metric 20
> +exit
> +!
> +route-map pve_bgp_bgpblue_in permit 10
> + match ip address pve_bgp_bgpblue_ips
> + call blue-in
> +exit
> +!
> +route-map pve_bgp_bgpred_in permit 10
> + match ip address pve_bgp_bgpred_ips
> + call red-in
> +exit
> +!
> +route-map pve_bgp_vrf_blue permit 100
> + match ip address pve_bgp_bgpblue_ips
> + set src 10.1.0.1
> +exit
> +!
> +route-map pve_bgp_vrf_blue permit 65535
> +exit
> +!
> +route-map pve_bgp_vrf_red permit 110
> + match ip address pve_bgp_bgpred_ips
> + set src 10.1.0.1
> +exit
> +!
> +route-map pve_bgp_vrf_red permit 65535
> +exit
> +!
> +route-map pve_ospf_vrf_blue permit 120
> + match ip address pve_ospf_ospfblue_ips
> + set src 10.0.0.1
> +exit
> +!
> +route-map pve_ospf_vrf_red permit 130
> + match ip address pve_ospf_ospfred_ips
> + set src 10.0.0.1
> +exit
> +!
> +route-map red-in permit 10
> + set local-preference 100
> +exit
> +!
> +route-map red-out permit 10
> + set metric 10
> +exit
> +!
> +vrf vrf_blue
> + ip protocol bgp route-map pve_bgp_vrf_blue
> + ip protocol ospf route-map pve_ospf_vrf_blue
> +exit-vrf
> +!
> +vrf vrf_red
> + ip protocol bgp route-map pve_bgp_vrf_red
> + ip protocol ospf route-map pve_ospf_vrf_red
> +exit-vrf





  reply	other threads:[~2026-11-18 15:01 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 16:11 [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/32] SDN VRF support Gabriel Goller
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 [this message]
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=f5acd550-4497-4f66-aebc-0305052dd8ca@proxmox.com \
    --to=s.hanreich@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal