public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Gabriel Goller <g.goller@proxmox.com>
To: Stefan Hanreich <s.hanreich@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [PATCH proxmox-ve-rs 8/9] ve-config: frr: implement frr config generation for route maps
Date: Wed, 25 Mar 2026 16:03:00 +0100	[thread overview]
Message-ID: <lj4haopjn75lvw4mpuqknshvmwdddfz4hogykxnqxenbkgsvbj@v4ovx5ud34ct> (raw)
In-Reply-To: <20260325094142.174364-11-s.hanreich@proxmox.com>

On 25.03.2026 10:41, Stefan Hanreich wrote:
> Implements conversion traits for all the section config types, so they
> can be converted into their respective FRR template counterpart.
> 
> This module contains a helper for adding all route map entries to an
> existing FRR configuration. It will overwrite existing route map
> entries that have the same name AND order number. But if entries with
> the same name, but different ordering, exist they will only be added
> to the existing FRR configuration without dropping the other route map
> entries.
> This currently not relevant either way, because the initial API
> implementation will reject creating route maps with names of route
> maps that the stack auto-generates. In the future this behavior can
> be used for selectively overriding / appending existing Proxmox VE
> route maps.
> 
> The helper also automatically orders route map entries according to
> their ordering number. This allows for deterministic FRR configuration
> output, which is important for tests and convenient for human
> readability.
> 
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> ---
>  proxmox-ve-config/src/sdn/route_map.rs | 271 +++++++++++++++++++++++++
>  1 file changed, 271 insertions(+)
> 
> diff --git a/proxmox-ve-config/src/sdn/route_map.rs b/proxmox-ve-config/src/sdn/route_map.rs
> index 3f4da56..8d8c4dc 100644
> --- a/proxmox-ve-config/src/sdn/route_map.rs
> +++ b/proxmox-ve-config/src/sdn/route_map.rs
[snip]
> +    impl Into<RouteMapMatch> for MatchAction {
> +        fn into(self) -> RouteMapMatch {
> +            match self {
> +                Self::RouteType(evpn_route_type) => RouteMapMatch::RouteType(evpn_route_type),
> +                Self::Vni(vni) => RouteMapMatch::Vni(vni),
> +                Self::IpAddressPrefixList(prefix_list_name) => {
> +                    RouteMapMatch::IpAddressPrefixList(prefix_list_name.into())
> +                }
> +                Self::Ip6AddressPrefixList(prefix_list_name) => {
> +                    RouteMapMatch::Ip6AddressPrefixList(prefix_list_name.into())
> +                }
> +                Self::IpNextHopPrefixList(prefix_list_name) => {
> +                    RouteMapMatch::IpNextHopPrefixList(prefix_list_name.into())
> +                }
> +                Self::Ip6NextHopPrefixList(prefix_list_name) => {
> +                    RouteMapMatch::Ip6NextHopPrefixList(prefix_list_name.into())
> +                }
> +                Self::IpNextHopAddress(ipv4_addr) => RouteMapMatch::IpNextHopAddress(*ipv4_addr),
> +                Self::Ip6NextHopAddress(ipv6_addr) => RouteMapMatch::Ip6NextHopAddress(*ipv6_addr),
> +                Self::Metric(metric) => RouteMapMatch::Metric(metric),
> +                Self::LocalPreference(local_preference) => {
> +                    RouteMapMatch::LocalPreference(local_preference)
> +                }
> +                Self::Peer(ip_addr) => RouteMapMatch::Peer(ip_addr),
> +                Self::Tag(tag) => RouteMapMatch::Tag(tag),
> +            }
> +        }
> +    }
> +
> +    impl Into<RouteMapSet> for SetAction {
> +        fn into(self) -> RouteMapSet {
> +            match self {
> +                Self::IpNextHopPeerAddress => RouteMapSet::IpNextHopPeerAddress,
> +                Self::IpNextHopUnchanged => RouteMapSet::IpNextHopUnchanged,
> +                Self::IpNextHop(ipv4_addr) => RouteMapSet::IpNextHop(*ipv4_addr),
> +                Self::Ip6NextHopPeerAddress => RouteMapSet::Ip6NextHopPeerAddress,
> +                Self::Ip6NextHopPreferGlobal => RouteMapSet::Ip6NextHopPreferGlobal,
> +                Self::Ip6NextHop(ipv6_addr) => RouteMapSet::Ip6NextHop(*ipv6_addr),
> +                Self::LocalPreference(local_preference) => {
> +                    RouteMapSet::LocalPreference(local_preference)
> +                }
> +                Self::Tag(tag) => RouteMapSet::Tag(tag),
> +                Self::Weight(weight) => RouteMapSet::Weight(weight),
> +                Self::Metric(metric) => RouteMapSet::Metric(metric),
> +                Self::Src(src) => RouteMapSet::Src(src),
> +            }
> +        }
> +    }
> +
> +    impl Into<FrrRouteMap> for RouteMapEntry {
> +        fn into(self) -> FrrRouteMap {
> +            FrrRouteMap {
> +                seq: self.id.order,
> +                action: match self.action {
> +                    RouteMapAction::Permit => proxmox_frr::ser::route_map::AccessAction::Permit,
> +                    RouteMapAction::Deny => proxmox_frr::ser::route_map::AccessAction::Deny,
> +                },
> +                matches: self
> +                    .match_actions
> +                    .into_iter()
> +                    .map(|match_action| match_action.into_inner().into())
> +                    .collect(),
> +                sets: self
> +                    .set_actions
> +                    .into_iter()
> +                    .map(|set_action| set_action.into_inner().into())
> +                    .collect(),
> +                custom_frr_config: Default::default(),
> +            }
> +        }
> +    }

These impls above could be From<>, even though we never need the other direction
:) clippy otherwise complains.

> +
> +    /// Add a list of Route Map Entries to a [`FrrConfig`].
> +    ///
> +    /// This method takes a list of Route Map Entries and adds them to given FRR configuration.
> +    /// Existing Route Map entries with the same name, but different ordering number will remain in
> +    /// the configuration. Entries with the same ordering will get merged.
> +    ///
> +    /// This behavior is different from Prefix Lists, where we overwrite existing Prefix Lists in
> +    /// the FRR configuration. The reason for this is that users can override the Route Map setting
> +    /// in the EVPN controller.
> +    pub fn build_frr_route_maps(
> +        config: impl IntoIterator<Item = RouteMap>,
> +        frr_config: &mut FrrConfig,
> +    ) -> Result<(), anyhow::Error> {
> +        for route_map in config.into_iter() {
> +            let RouteMap::RouteMapEntry(route_map) = route_map;
> +            let route_map_name = RouteMapName::new(route_map.id.route_map_id.to_string());
> +
> +            if let Some(frr_route_map) = frr_config.routemaps.get_mut(&route_map_name) {
> +                let idx =
> +                    frr_route_map.partition_point(|element| element.seq <= route_map.id().order());
> +                frr_route_map.insert(idx, route_map.into());
> +            } else {
> +                frr_config
> +                    .routemaps
> +                    .insert(route_map_name, vec![route_map.into()]);
> +            }
> +        }
> +
> +        Ok(())
> +    }
> +
> [snip]




  reply	other threads:[~2026-03-25 15:02 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-03-25  9:41 [PATCH cluster/network/proxmox{-ve-rs,-perl-rs} 00/27] Add support for route maps / prefix lists to SDN Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-cluster 1/2] cfs: add 'sdn/route-maps.cfg' to observed files Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-cluster 2/2] cfs: add 'sdn/prefix-lists.cfg' " Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 1/9] sdn-types: add common route-map helper types Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 2/9] frr: implement routemap match/set statements via adjacent tagging Stefan Hanreich
2026-03-26 14:44   ` Hannes Laimer
2026-03-27  9:02     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 3/9] frr: allow rendering prefix-lists/route-maps separately Stefan Hanreich
2026-03-25 14:32   ` Gabriel Goller
2026-03-26 12:17     ` Stefan Hanreich
2026-03-27 10:50   ` Hannes Laimer
2026-03-27 11:34     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 4/9] frr-templates: change route maps template to adapt to new types Stefan Hanreich
2026-03-25 14:33   ` Gabriel Goller
2026-03-25 14:58     ` Gabriel Goller
2026-03-27 11:01   ` Hannes Laimer
2026-03-27 11:17     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 5/9] ve-config: add prefix list section config Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 6/9] ve-config: frr: implement frr config generation for prefix lists Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 7/9] ve-config: add route map section config Stefan Hanreich
2026-03-25 14:35   ` Gabriel Goller
2026-03-26 13:49     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 8/9] ve-config: frr: implement frr config generation for route maps Stefan Hanreich
2026-03-25 15:03   ` Gabriel Goller [this message]
2026-03-26 13:50     ` Stefan Hanreich
2026-03-27 11:17   ` Hannes Laimer
2026-03-27 11:21     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-ve-rs 9/9] ve-config: fabrics: adapt frr config generation to new format Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-perl-rs 1/3] pve-rs: sdn: add route maps module Stefan Hanreich
2026-03-26 10:32   ` Wolfgang Bumiller
2026-03-26 13:57     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-perl-rs 2/3] pve-rs: sdn: add prefix lists module Stefan Hanreich
2026-03-25  9:41 ` [PATCH proxmox-perl-rs 3/3] sdn: add prefix list / route maps to frr config generation helper Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 01/13] controller: bgp: evpn: adapt to new match / set frr config syntax Stefan Hanreich
2026-03-26 15:19   ` Hannes Laimer
2026-03-27 10:05     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 02/13] sdn: add prefix lists module Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 03/13] api2: add prefix list module Stefan Hanreich
2026-03-26 15:01   ` Hannes Laimer
2026-03-27  9:57     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 04/13] sdn: add route map module Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 05/13] api2: add route maps api module Stefan Hanreich
2026-03-26 15:05   ` Hannes Laimer
2026-03-27  9:57     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 06/13] api2: add route map module Stefan Hanreich
2026-03-26 15:07   ` Hannes Laimer
2026-03-27  9:57     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 07/13] api2: add route map entry module Stefan Hanreich
2026-03-26 15:13   ` Hannes Laimer
2026-03-27 10:01     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 08/13] evpn controller: add route_map_{in,out} parameter Stefan Hanreich
2026-03-27 10:44   ` Hannes Laimer
2026-03-27 11:12     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 09/13] sdn: generate route map / prefix list configuration on sdn apply Stefan Hanreich
2026-03-27 10:47   ` Hannes Laimer
2026-03-27 11:13     ` Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 10/13] tests: add simple route map test case Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 11/13] tests: add bgp evpn route map/prefix list testcase Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 12/13] tests: add route map with prefix " Stefan Hanreich
2026-03-25  9:41 ` [PATCH pve-network 13/13] bgp controller: allow configuring custom route maps Stefan Hanreich
2026-03-25 11:38 ` [PATCH cluster/network/proxmox{-ve-rs,-perl-rs} 00/27] Add support for route maps / prefix lists to SDN Stefan Hanreich
2026-03-27 10:17 ` Stefan Hanreich

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=lj4haopjn75lvw4mpuqknshvmwdddfz4hogykxnqxenbkgsvbj@v4ovx5ud34ct \
    --to=g.goller@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    --cc=s.hanreich@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