From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-perl-rs v4 22/47] sdn: add prefix list / route maps to frr config generation helper
Date: Mon, 4 May 2026 18:03:19 +0200 [thread overview]
Message-ID: <20260504160350.395470-23-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20260504160350.395470-1-s.hanreich@proxmox.com>
With the addition of prefix lists and route maps, the helper needs to
be adapted so the FRR configuration for prefix lists and route maps
gets generated as well. Prefix lists and route maps are generated
before generating the fabric configuration, so it is possible for the
fabric config generation logic to check for the existence of prefix
lists and route maps.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
pve-rs/src/bindings/sdn/mod.rs | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/pve-rs/src/bindings/sdn/mod.rs b/pve-rs/src/bindings/sdn/mod.rs
index 9bddf1c..c6361c3 100644
--- a/pve-rs/src/bindings/sdn/mod.rs
+++ b/pve-rs/src/bindings/sdn/mod.rs
@@ -15,17 +15,39 @@ pub mod pve_rs_sdn {
use proxmox_ve_config::sdn::fabric::section_config::node::NodeId;
use crate::bindings::pve_rs_sdn_fabrics::PerlFabricConfig;
+ use crate::bindings::sdn::prefix_lists::pve_rs_sdn_prefix_lists::PerlPrefixListConfig;
+ use crate::bindings::sdn::route_maps::pve_rs_sdn_route_maps::PerlRouteMapConfig;
/// Return the FRR configuration for the passed FrrConfig and the FabricsConfig as an array of
/// strings, where each line represents a line in the FRR configuration.
#[export]
pub fn get_frr_raw_config(
mut frr_config: FrrConfig,
- #[try_from_ref] cfg: &PerlFabricConfig,
+ #[try_from_ref] prefix_list_config: &PerlPrefixListConfig,
+ #[try_from_ref] route_map_config: &PerlRouteMapConfig,
+ #[try_from_ref] fabric_config: &PerlFabricConfig,
node_id: NodeId,
) -> Result<Vec<String>, Error> {
- let fabric_config = cfg.fabric_config.lock().unwrap().clone().into_valid()?;
+ let prefix_list_config = prefix_list_config.prefix_lists.lock().unwrap();
+ proxmox_ve_config::sdn::prefix_list::frr::build_frr_prefix_lists(
+ prefix_list_config.values().cloned(),
+ &mut frr_config,
+ )?;
+
+ let route_map_config = route_map_config.route_maps.lock().unwrap();
+ proxmox_ve_config::sdn::route_map::frr::build_frr_route_maps(
+ route_map_config.values().cloned(),
+ &mut frr_config,
+ )?;
+
+ let fabric_config = fabric_config
+ .fabric_config
+ .lock()
+ .unwrap()
+ .clone()
+ .into_valid()?;
proxmox_ve_config::sdn::fabric::frr::build_fabric(node_id, fabric_config, &mut frr_config)?;
+
to_raw_config(&frr_config)
}
}
--
2.47.3
next prev parent reply other threads:[~2026-05-04 16:06 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-04 16:02 [PATCH access-control/cluster/manager/network/proxmox{-ve-rs,-perl-rs} v4 00/47] Add support for route maps / prefix lists to SDN Stefan Hanreich
2026-05-04 16:02 ` [PATCH pve-cluster v4 01/47] cfs: add 'sdn/route-maps.cfg' to observed files Stefan Hanreich
2026-05-04 16:02 ` [PATCH pve-cluster v4 02/47] cfs: add 'sdn/prefix-lists.cfg' " Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-access-control v4 03/47] permissions: add ACL path for prefix-lists and route-maps Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 04/47] frr: add constructor to prefix list name Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 05/47] sdn-types: add common route-map helper types Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 06/47] frr: change order type to u16 Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 07/47] frr: implement routemap match/set statements via adjacent tagging Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 08/47] frr: implement support for call and exit action Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 09/47] frr-templates: change route maps template to adapt to new frr types Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 10/47] ve-config: fabrics: adapt frr config generation Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 11/47] ve-config: add prefix list section config Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 12/47] ve-config: frr: implement frr config generation for prefix lists Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 13/47] ve-config: add route map section config Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 14/47] ve-config: frr: implement frr config generation for route maps Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 15/47] ve-config: add prefix lists integration tests Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 16/47] ve-config: add route maps " Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 17/47] fabrics: ospf: fix deserializing OspfDeletableProperties Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 18/47] fabrics: ospf: openfabric: allow user-defined route filter Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-ve-rs v4 19/47] frr: fabrics: apply route_filter setting Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-perl-rs v4 20/47] pve-rs: sdn: add route maps module Stefan Hanreich
2026-05-04 16:03 ` [PATCH proxmox-perl-rs v4 21/47] pve-rs: sdn: add prefix lists module Stefan Hanreich
2026-05-04 16:03 ` Stefan Hanreich [this message]
2026-05-04 16:03 ` [PATCH pve-network v4 23/47] controller: bgp: evpn: adapt to new match / set frr config syntax Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 24/47] sdn: add prefix lists module Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 25/47] sdn: add route map module Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 26/47] api2: add prefix list module Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 27/47] api2: add route maps module Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 28/47] api2: add route map module Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 29/47] api2: add route map entry module Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 30/47] evpn controller: add route_map_{in,out} parameter Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 31/47] bgp controller: allow configuring custom route maps Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 32/47] sdn: change detection for route maps / prefix lists Stefan Hanreich
2026-05-05 9:07 ` Hannes Laimer
2026-05-04 16:03 ` [PATCH pve-network v4 33/47] sdn: generate route map / prefix list configuration on sdn apply Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 34/47] sdn: frr: consider route maps and prefix lists in dry-run Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 35/47] fabrics: ospf: openfabric: add route_filter property Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 36/47] tests: add simple route map test case Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 37/47] tests: add bgp evpn route map/prefix list testcase Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 38/47] tests: add route map with prefix " Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-network v4 39/47] tests: add exit node with custom route map testcase Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 40/47] ui: sdn: add route map selector Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 41/47] ui: sdn: add prefix list selector Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 42/47] ui: sdn: add panel for managing prefix lists Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 43/47] ui: sdn: add panel for managing route map entries Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 44/47] ui: sdn: bgp controller: allow configuring route maps Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 45/47] ui: sdn: evpn " Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 46/47] ui: sdn: openfabric: add route filter Stefan Hanreich
2026-05-04 16:03 ` [PATCH pve-manager v4 47/47] ui: sdn: ospf: add route filter setting 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=20260504160350.395470-23-s.hanreich@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