From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 53FEB1FF13B for ; Wed, 25 Mar 2026 10:43:49 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B97D410004; Wed, 25 Mar 2026 10:42:40 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ve-rs 3/9] frr: allow rendering prefix-lists/route-maps separately Date: Wed, 25 Mar 2026 10:41:16 +0100 Message-ID: <20260325094142.174364-6-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260325094142.174364-1-s.hanreich@proxmox.com> References: <20260325094142.174364-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774431663529 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.722 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: X2W47OKF4D3H4DDIEHIONSTBSI6PVWC6 X-Message-ID-Hash: X2W47OKF4D3H4DDIEHIONSTBSI6PVWC6 X-MailFrom: s.hanreich@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: This is mainly useful for integration tests for the route maps / prefix lists feature in ve-config. It utilizes those methods to render route maps and prefix lists in tests, without having to render a full FRR configuration. Signed-off-by: Stefan Hanreich --- proxmox-frr/src/ser/serializer.rs | 35 ++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/proxmox-frr/src/ser/serializer.rs b/proxmox-frr/src/ser/serializer.rs index 2ac85d8..91aff1f 100644 --- a/proxmox-frr/src/ser/serializer.rs +++ b/proxmox-frr/src/ser/serializer.rs @@ -1,7 +1,12 @@ +use std::collections::BTreeMap; + use anyhow::Context; use minijinja::Environment; -use crate::ser::FrrConfig; +use crate::ser::{ + route_map::{PrefixListName, PrefixListRule, RouteMapEntry, RouteMapName}, + FrrConfig, +}; use proxmox_sortable_macro::sortable; #[sortable] @@ -91,3 +96,31 @@ pub fn dump(config: &FrrConfig) -> Result { pub fn to_raw_config(config: &FrrConfig) -> Result, anyhow::Error> { Ok(dump(config)?.lines().map(|line| line.to_owned()).collect()) } + +/// Render Prefix Lists into an FRR config string. +/// +/// Currently only used for testing the rendering of prefix lists, to avoid having to render the +/// whole FRR configuration file. +pub fn render_prefix_lists( + prefix_lists: BTreeMap>, +) -> Result { + create_env() + .get_template("prefix_lists.jinja") + .with_context(|| "could not obtain frr template from environment")? + .render(prefix_lists) + .with_context(|| "could not render frr template") +} + +/// Render Route Maps into an FRR config string. +/// +/// Currently only used for testing the rendering of route maps, to avoid having to render the +/// whole FRR configuration file. +pub fn render_route_maps( + route_maps: BTreeMap>, +) -> Result { + create_env() + .get_template("route_maps.jinja") + .with_context(|| "could not obtain frr template from environment")? + .render(route_maps) + .with_context(|| "could not render frr template") +} -- 2.47.3