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 5BC6E1FF140 for ; Fri, 27 Mar 2026 12:34:22 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ADACF75A5; Fri, 27 Mar 2026 12:34:43 +0100 (CET) Message-ID: Date: Fri, 27 Mar 2026 12:34:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH proxmox-ve-rs 3/9] frr: allow rendering prefix-lists/route-maps separately To: Hannes Laimer , pve-devel@lists.proxmox.com References: <20260325094142.174364-1-s.hanreich@proxmox.com> <20260325094142.174364-6-s.hanreich@proxmox.com> <2697a819-b78d-468d-8ebe-6a0fb796b4c2@proxmox.com> Content-Language: en-US From: Stefan Hanreich In-Reply-To: <2697a819-b78d-468d-8ebe-6a0fb796b4c2@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.708 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: JV36VRX2FB5QUBTPPW75JLAWU2JL3E6J X-Message-ID-Hash: JV36VRX2FB5QUBTPPW75JLAWU2JL3E6J 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: On 3/27/26 11:50 AM, Hannes Laimer wrote: > On 2026-03-25 10:43, Stefan Hanreich wrote: >> 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) > > the templates expect named keys, no? > ``` > - .render(prefix_lists) > + .render(minijinja::context! { prefix_lists => prefix_lists }) > ``` > they're actually unused and just leftover from development - will be removed in the upcoming v2, since the tests switched over to using dump anyway...