From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH proxmox-ve-rs 9/9] frr: store frr template content as a const map
Date: Tue, 3 Feb 2026 17:01:16 +0100 [thread overview]
Message-ID: <20260203160246.353351-10-g.goller@proxmox.com> (raw)
In-Reply-To: <20260203160246.353351-1-g.goller@proxmox.com>
We need to retrieve the template content from pve-network (for the
pvesdn cli), so we need to make these public. Use the `phf` crate to
store them in a const map.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
proxmox-frr/Cargo.toml | 1 +
proxmox-frr/debian/control | 4 +++
proxmox-frr/src/ser/serializer.rs | 56 +++++++++----------------------
3 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/proxmox-frr/Cargo.toml b/proxmox-frr/Cargo.toml
index 560a04b42980..173d8dfc8924 100644
--- a/proxmox-frr/Cargo.toml
+++ b/proxmox-frr/Cargo.toml
@@ -17,6 +17,7 @@ serde = { workspace = true, features = [ "derive" ] }
serde_repr = "0.1"
minijinja = { version = "2.5", features = [ "multi_template", "loader" ] }
bon = "3.7"
+phf = { version = "0.11.2", features = ["macros"] }
proxmox-network-types = { workspace = true }
proxmox-sdn-types = { workspace = true }
diff --git a/proxmox-frr/debian/control b/proxmox-frr/debian/control
index 10651e640ba3..fb0960c4c75d 100644
--- a/proxmox-frr/debian/control
+++ b/proxmox-frr/debian/control
@@ -11,6 +11,8 @@ Build-Depends-Arch: cargo:native <!nocheck>,
librust-minijinja-2+default-dev (>= 2.5-~~) <!nocheck>,
librust-minijinja-2+loader-dev (>= 2.5-~~) <!nocheck>,
librust-minijinja-2+multi-template-dev (>= 2.5-~~) <!nocheck>,
+ librust-phf-0.11+default-dev (>= 0.11.2-~~) <!nocheck>,
+ librust-phf-0.11+macros-dev (>= 0.11.2-~~) <!nocheck>,
librust-proxmox-network-types-0.1+default-dev (>= 0.1.1-~~) <!nocheck>,
librust-proxmox-sdn-types-0.1+default-dev <!nocheck>,
librust-proxmox-serde-1+default-dev <!nocheck>,
@@ -36,6 +38,8 @@ Depends:
librust-minijinja-2+default-dev (>= 2.5-~~),
librust-minijinja-2+loader-dev (>= 2.5-~~),
librust-minijinja-2+multi-template-dev (>= 2.5-~~),
+ librust-phf-0.11+default-dev (>= 0.11.2-~~),
+ librust-phf-0.11+macros-dev (>= 0.11.2-~~),
librust-proxmox-network-types-0.1+default-dev (>= 0.1.1-~~),
librust-proxmox-sdn-types-0.1+default-dev,
librust-proxmox-serde-1+default-dev,
diff --git a/proxmox-frr/src/ser/serializer.rs b/proxmox-frr/src/ser/serializer.rs
index 12e4190744eb..67cc36562e9b 100644
--- a/proxmox-frr/src/ser/serializer.rs
+++ b/proxmox-frr/src/ser/serializer.rs
@@ -5,6 +5,21 @@ use minijinja::Environment;
use crate::ser::FrrConfig;
+pub static TEMPLATES: phf::Map<&'static str, &'static str> = phf::phf_map! {
+ "fabricd.jinja" => include_str!("/usr/share/proxmox-frr/templates/fabricd.jinja"),
+ "bgpd.jinja" => include_str!("/usr/share/proxmox-frr/templates/bgpd.jinja"),
+ "isisd.jinja" => include_str!("/usr/share/proxmox-frr/templates/isisd.jinja"),
+ "ospfd.jinja" => include_str!("/usr/share/proxmox-frr/templates/ospfd.jinja"),
+ "bgp_router.jinja" => include_str!("/usr/share/proxmox-frr/templates/bgp_router.jinja"),
+ "interface.jinja" => include_str!("/usr/share/proxmox-frr/templates/interface.jinja"),
+ "access_lists.jinja" => include_str!("/usr/share/proxmox-frr/templates/access_lists.jinja"),
+ "prefix_lists.jinja" => include_str!("/usr/share/proxmox-frr/templates/prefix_lists.jinja"),
+ "route_maps.jinja" => include_str!("/usr/share/proxmox-frr/templates/route_maps.jinja"),
+ "ip_routes.jinja" => include_str!("/usr/share/proxmox-frr/templates/ip_routes.jinja"),
+ "protocol_routemaps.jinja" => include_str!("/usr/share/proxmox-frr/templates/protocol_routemaps.jinja"),
+ "frr.conf.jinja" => include_str!("/usr/share/proxmox-frr/templates/frr.conf.jinja"),
+};
+
fn create_env<'a>() -> Environment<'a> {
let mut env = Environment::new();
@@ -18,46 +33,7 @@ fn create_env<'a>() -> Environment<'a> {
match fs::read_to_string(override_path) {
Ok(template_content) => Ok(Some(template_content)),
// if that fails, read the vendored template:
- Err(_) => match name {
- "fabricd.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/fabricd.jinja").to_owned(),
- )),
- "bgpd.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/bgpd.jinja").to_owned(),
- )),
- "isisd.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/isisd.jinja").to_owned(),
- )),
- "ospfd.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/ospfd.jinja").to_owned(),
- )),
- "bgp_router.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/bgp_router.jinja").to_owned(),
- )),
- "interface.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/interface.jinja").to_owned(),
- )),
- "access_lists.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/access_lists.jinja").to_owned(),
- )),
- "prefix_lists.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/prefix_lists.jinja").to_owned(),
- )),
- "route_maps.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/route_maps.jinja").to_owned(),
- )),
- "ip_routes.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/ip_routes.jinja").to_owned(),
- )),
- "protocol_routemaps.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/protocol_routemaps.jinja")
- .to_owned(),
- )),
- "frr.conf.jinja" => Ok(Some(
- include_str!("/usr/share/proxmox-frr/templates/frr.conf.jinja").to_owned(),
- )),
- _ => Ok(None),
- },
+ Err(_) => Ok(TEMPLATES.get(name).map(|template| (*template).to_owned())),
}
});
--
2.47.3
next prev parent reply other threads:[~2026-02-03 16:02 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-03 16:01 [PATCH docs/manager/network/proxmox{-ve-rs,-perl-rs} 00/23] Generate frr config using jinja templates and rust types Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 1/9] ve-config: firewall: cargo fmt Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 2/9] frr: add proxmox-frr-templates package that contains templates Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 3/9] ve-config: remove FrrConfigBuilder struct Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 4/9] sdn-types: support variable-length NET identifier Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 5/9] frr: add template serializer and serialize fabrics using templates Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 6/9] frr: add isis configuration and templates Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 7/9] frr: support custom frr configuration lines Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-ve-rs 8/9] frr: add bgp support with templates and serialization Gabriel Goller
2026-02-03 16:01 ` Gabriel Goller [this message]
2026-02-03 16:01 ` [PATCH proxmox-perl-rs 1/2] sdn: add function to generate the frr config for all daemons Gabriel Goller
2026-02-03 16:01 ` [PATCH proxmox-perl-rs 2/2] sdn: add method to get a frr template Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 01/10] sdn: remove duplicate comment line '!' in frr config Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 02/10] sdn: tests: add missing comment " Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 03/10] tests: use Test::Differences to make test assertions Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 04/10] sdn: write structured frr config that can be rendered using templates Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 05/10] tests: rearrange some statements in the frr config Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 06/10] sdn: adjust frr.conf.local merging to rust template types Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 07/10] cli: add pvesdn cli tool for managing frr template overrides Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 08/10] debian: handle user modifications to FRR templates via ucf Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 09/10] api: add dry-run endpoint for sdn apply to preview changes Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-network 10/10] test: add test for frr.conf.local merging Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-manager 1/1] sdn: add dry-run view for sdn apply Gabriel Goller
2026-02-03 16:01 ` [PATCH pve-docs 1/1] docs: add man page for the `pvesdn` cli 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=20260203160246.353351-10-g.goller@proxmox.com \
--to=g.goller@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