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 B2B791FF140 for ; Fri, 27 Mar 2026 16:03:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A2FD11045A; Fri, 27 Mar 2026 16:02:14 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ve-rs v8 06/21] frr: add isis configuration and templates Date: Fri, 27 Mar 2026 16:01:09 +0100 Message-ID: <20260327150127.545193-7-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327150127.545193-1-g.goller@proxmox.com> References: <20260327150127.545193-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774623641469 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.021 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: A4QI3ETNCO6SH7B33ADFZHYVTNH6WPGC X-Message-ID-Hash: A4QI3ETNCO6SH7B33ADFZHYVTNH6WPGC X-MailFrom: g.goller@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 CC: Wolfgang Bumiller X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Add templates and rust configuration types to render configuration for the isis daemon. This allows us to generate the config in perl, then pass it to rust and then render the template in rust. Signed-off-by: Gabriel Goller Co-authored-by: Stefan Hanreich Reviewed-by: Hannes Laimer Tested-by: Stefan Hanreich Reviewed-by: Wolfgang Bumiller --- .../templates/frr.conf.jinja | 1 + proxmox-frr-templates/templates/isisd.jinja | 34 ++++++++++++++ proxmox-frr/src/ser/isis.rs | 47 +++++++++++++++++++ proxmox-frr/src/ser/mod.rs | 12 +++++ proxmox-frr/src/ser/serializer.rs | 6 ++- 5 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 proxmox-frr-templates/templates/isisd.jinja create mode 100644 proxmox-frr/src/ser/isis.rs diff --git a/proxmox-frr-templates/templates/frr.conf.jinja b/proxmox-frr-templates/templates/frr.conf.jinja index 8458c6a61112..f8802f845332 100644 --- a/proxmox-frr-templates/templates/frr.conf.jinja +++ b/proxmox-frr-templates/templates/frr.conf.jinja @@ -1,3 +1,4 @@ +{% include "isisd.jinja" %} {% include "fabricd.jinja" %} {% include "ospfd.jinja" %} {% include "access_lists.jinja" %} diff --git a/proxmox-frr-templates/templates/isisd.jinja b/proxmox-frr-templates/templates/isisd.jinja new file mode 100644 index 000000000000..e3c9292d575c --- /dev/null +++ b/proxmox-frr-templates/templates/isisd.jinja @@ -0,0 +1,34 @@ +{% from "interface.jinja" import interface %} +{% for router_name, router_config in isis.router|items %} +! +router isis {{ router_name }} + net {{ router_config.net }} +{% if router_config.redistribute %} +{% if router_config.redistribute.ipv4_connected %} + redistribute ipv4 connected {{ router_config.redistribute.ipv4_connected }} +{% endif %} +{% if router_config.redistribute.ipv6_connected %} + redistribute ipv6 connected {{ router_config.redistribute.ipv6_connected }} +{% endif %} +{% endif %} +{% if router_config.log_adjacency_changes %} + log-adjacency-changes +{% endif %} +{% for line in router_config.custom_frr_config %} +{{ line }} +{% endfor %} +exit +{% endfor %} +{% for interface_name, interface_config in isis.interfaces|items %} +{% call interface(interface_name, interface_config.addresses_v4, interface_config.addresses_v6) %} +{% if interface_config.domain and interface_config.is_ipv4 %} + ip router isis {{ interface_config.domain }} +{% endif %} +{% if interface_config.domain and interface_config.is_ipv6 %} + ipv6 router isis {{ interface_config.domain }} +{% endif %} +{% for line in interface_config.custom_frr_config %} +{{ line }} +{% endfor %} +{% endcall %} +{% endfor %} diff --git a/proxmox-frr/src/ser/isis.rs b/proxmox-frr/src/ser/isis.rs new file mode 100644 index 000000000000..211c5b21e9e1 --- /dev/null +++ b/proxmox-frr/src/ser/isis.rs @@ -0,0 +1,47 @@ +use std::fmt::Debug; + +use proxmox_sdn_types::net::Net; +use serde::Deserialize; +use serde::Serialize; + +use crate::ser::FrrWord; + +#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] +pub struct IsisRouterName(FrrWord); + +#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] +pub enum IsisLevel { + #[serde(rename = "level-1")] + Level1, + #[serde(rename = "level-2")] + Level2, + #[serde(rename = "level-1-2")] + Level12, +} + +#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] +pub struct Redistribute { + ipv4_connected: IsisLevel, + ipv6_connected: IsisLevel, +} + +#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] +pub struct IsisRouter { + pub net: Net, + #[serde(default, deserialize_with = "proxmox_serde::perl::deserialize_bool")] + pub log_adjacency_changes: Option, + pub redistribute: Option, + #[serde(default)] + pub custom_frr_config: Vec, +} + +#[derive(Clone, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)] +pub struct IsisInterface { + pub domain: IsisRouterName, + #[serde(deserialize_with = "proxmox_serde::perl::deserialize_bool")] + pub is_ipv4: bool, + #[serde(deserialize_with = "proxmox_serde::perl::deserialize_bool")] + pub is_ipv6: bool, + #[serde(default)] + pub custom_frr_config: Vec, +} diff --git a/proxmox-frr/src/ser/mod.rs b/proxmox-frr/src/ser/mod.rs index ef56d742857b..fd491c9a0390 100644 --- a/proxmox-frr/src/ser/mod.rs +++ b/proxmox-frr/src/ser/mod.rs @@ -1,3 +1,4 @@ +pub mod isis; pub mod openfabric; pub mod ospf; pub mod route_map; @@ -190,6 +191,9 @@ pub struct FrrConfig { pub openfabric: OpenfabricFrrConfig, #[serde(default)] pub ospf: OspfFrrConfig, + #[serde(default)] + pub isis: IsisFrrConfig, + #[serde(default)] pub protocol_routemaps: BTreeMap, #[serde(default)] @@ -206,6 +210,14 @@ pub struct OpenfabricFrrConfig { pub interfaces: BTreeMap>, } +#[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)] +pub struct IsisFrrConfig { + #[serde(default)] + pub router: BTreeMap, + #[serde(default)] + pub interfaces: BTreeMap>, +} + #[derive(Clone, Debug, PartialEq, Eq, Default, Serialize, Deserialize)] pub struct OspfFrrConfig { #[serde(default)] diff --git a/proxmox-frr/src/ser/serializer.rs b/proxmox-frr/src/ser/serializer.rs index 52e3553f1c32..9b553486e5f1 100644 --- a/proxmox-frr/src/ser/serializer.rs +++ b/proxmox-frr/src/ser/serializer.rs @@ -5,11 +5,15 @@ use crate::ser::FrrConfig; use proxmox_sortable_macro::sortable; #[sortable] -pub static TEMPLATES: [(&str, &str); 7] = sorted!([ +pub static TEMPLATES: [(&str, &str); 8] = sorted!([ ( "fabricd.jinja", include_str!("/usr/share/proxmox-frr/templates/fabricd.jinja"), ), + ( + "isisd.jinja", + include_str!("/usr/share/proxmox-frr/templates/isisd.jinja") + ), ( "ospfd.jinja", include_str!("/usr/share/proxmox-frr/templates/ospfd.jinja"), -- 2.47.3