From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 10CA11FF13A for ; Wed, 13 May 2026 17:15:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 489FD15A62; Wed, 13 May 2026 17:15:03 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ve-rs v2 3/9] ve-config: add redistribute setting to ospf section config Date: Wed, 13 May 2026 17:13:53 +0200 Message-ID: <20260513151411.383388-4-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260513151411.383388-1-s.hanreich@proxmox.com> References: <20260513151411.383388-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: 1778685254581 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.605 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ospf.rs] Message-ID-Hash: NO3BPXOUO4ZPV7WR6PYW63NIFF4ERJLW X-Message-ID-Hash: NO3BPXOUO4ZPV7WR6PYW63NIFF4ERJLW 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: The settings are global to the fabric, which means that every node participating in the fabric will have the same redistribution settings. For now this seems sufficient, but if the need arises it is always possible to implement a node-level override. Signed-off-by: Stefan Hanreich --- proxmox-ve-config/src/sdn/fabric/mod.rs | 14 ++++- .../fabric/section_config/protocol/ospf.rs | 59 +++++++++++++++++++ 2 files changed, 72 insertions(+), 1 deletion(-) diff --git a/proxmox-ve-config/src/sdn/fabric/mod.rs b/proxmox-ve-config/src/sdn/fabric/mod.rs index 2fdcc6c..146563e 100644 --- a/proxmox-ve-config/src/sdn/fabric/mod.rs +++ b/proxmox-ve-config/src/sdn/fabric/mod.rs @@ -896,7 +896,12 @@ impl FabricConfig { let FabricSectionUpdater:: { ip_prefix, ip6_prefix, - properties: OspfPropertiesUpdater { area, route_filter }, + properties: + OspfPropertiesUpdater { + area, + route_filter, + redistribute, + }, delete, } = updater; @@ -916,6 +921,10 @@ impl FabricConfig { fabric_section.properties.route_filter = Some(route_filter); } + if let Some(redistribute) = redistribute { + fabric_section.properties.redistribute = redistribute; + } + for property in delete { match property { FabricDeletableProperties::IpPrefix => { @@ -929,6 +938,9 @@ impl FabricConfig { ) => { fabric_section.properties.route_filter = None; } + FabricDeletableProperties::Protocol( + OspfDeletableProperties::Redistribute, + ) => fabric_section.properties.redistribute = Vec::new(), } } diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs index 66f17dd..f61e754 100644 --- a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs +++ b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs @@ -14,6 +14,54 @@ use crate::sdn::fabric::FabricConfigError; use crate::sdn::prefix_list::PrefixListId; #[api] +#[derive(Debug, Clone, Serialize, Deserialize, Hash, Copy)] +#[serde(rename_all = "lowercase")] +/// OSPF redistribution source protocols +pub enum OspfRedistributionSource { + /// redistribute BGP routes + Bgp, + /// redistribute connected routes + Connected, + /// redistribute IS-IS routes + Isis, + /// redistribute kernel routes + Kernel, + /// redistribute Openfabric routes + Openfabric, + /// redistribute OSPF routes + Ospf, + /// redistribute static routes + Static, +} + +#[api] +#[derive(Debug, Clone, Serialize, Deserialize, Hash)] +#[serde(rename_all = "kebab-case")] +/// An OSPF redistribution +pub struct OspfRedistribution { + /// The source protocol for this redistribution + pub(crate) source: OspfRedistributionSource, + /// The metric that should be applied to redistributed routes + #[serde(skip_serializing_if = "Option::is_none")] + pub(crate) metric: Option, + /// The name of the route map used for filtering redistributed routes + #[serde(skip_serializing_if = "Option::is_none")] + pub(crate) route_map: Option, +} + +#[api( + properties: { + redistribute: { + type: Array, + optional: true, + items: { + type: String, + description: "An OSPF redistribution source.", + format: &ApiStringFormat::PropertyString(&OspfRedistribution::API_SCHEMA), + } + } + } +)] #[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)] /// Properties for an Ospf fabric. pub struct OspfProperties { @@ -25,15 +73,25 @@ pub struct OspfProperties { /// besides the configured IP prefix. #[serde(skip_serializing_if = "Option::is_none")] pub(crate) route_filter: Option, + + /// Redistribution configuration + #[serde(default, skip_serializing_if = "Vec::is_empty")] + #[updater(serde(skip_serializing_if = "Option::is_none"))] + pub(crate) redistribute: Vec>, } impl OspfProperties { pub fn set_area(&mut self, value: Area) { self.area = value; } + pub fn area(&self) -> &Area { &self.area } + + pub fn redistributions(&self) -> impl IntoIterator { + self.redistribute.iter().map(Deref::deref) + } } impl Validatable for FabricSection { @@ -60,6 +118,7 @@ impl Validatable for FabricSection { #[serde(rename_all = "snake_case")] pub enum OspfDeletableProperties { RouteFilter, + Redistribute, } #[api( -- 2.47.3