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 D86F41FF183 for ; Wed, 2 Jul 2025 16:55:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E163A1F6F3; Wed, 2 Jul 2025 16:52:05 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Wed, 2 Jul 2025 16:50:05 +0200 Message-Id: <20250702145101.894299-21-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250702145101.894299-1-g.goller@proxmox.com> References: <20250702145101.894299-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.019 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 Subject: [pve-devel] [PATCH proxmox-ve-rs v4 14/22] config: sdn: fabrics: add ospf properties X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" From: Stefan Hanreich Define the protocol-specific properties for OSPF and add the concrete section types to the Fabric and Node enum. Currently only area is included, which is also the only property that is required by FRR. We wanted to start with a minimal set of properties and add any options later on, depending on feedback from users. Co-authored-by: Gabriel Goller Signed-off-by: Stefan Hanreich --- .../src/sdn/fabric/section_config/fabric.rs | 23 ++++- .../src/sdn/fabric/section_config/node.rs | 12 ++- .../sdn/fabric/section_config/protocol/mod.rs | 1 + .../fabric/section_config/protocol/ospf.rs | 88 +++++++++++++++++++ 4 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs b/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs index 3e56e2bfea2d..8ecf725c4641 100644 --- a/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs +++ b/proxmox-ve-config/src/sdn/fabric/section_config/fabric.rs @@ -7,8 +7,11 @@ use proxmox_schema::{ Updater, UpdaterType, }; -use crate::sdn::fabric::section_config::protocol::openfabric::{ - OpenfabricDeletableProperties, OpenfabricProperties, OpenfabricPropertiesUpdater, +use crate::sdn::fabric::section_config::protocol::{ + openfabric::{ + OpenfabricDeletableProperties, OpenfabricProperties, OpenfabricPropertiesUpdater, + }, + ospf::{OspfDeletableProperties, OspfProperties, OspfPropertiesUpdater}, }; pub const FABRIC_ID_REGEX_STR: &str = r"(?:[a-zA-Z0-9])(?:[a-zA-Z0-9\-]){0,6}(?:[a-zA-Z0-9])?"; @@ -130,6 +133,10 @@ impl UpdaterType for FabricSection { type Updater = FabricSectionUpdater; } +impl UpdaterType for FabricSection { + type Updater = FabricSectionUpdater; +} + /// Enum containing all types of fabrics. /// /// It utilizes [`FabricSection`] to define all possible types of fabrics. For parsing the @@ -149,6 +156,7 @@ impl UpdaterType for FabricSection { #[serde(rename_all = "snake_case", tag = "protocol")] pub enum Fabric { Openfabric(FabricSection), + Ospf(FabricSection), } impl UpdaterType for Fabric { @@ -162,6 +170,7 @@ impl Fabric { pub fn id(&self) -> &FabricId { match self { Self::Openfabric(fabric_section) => fabric_section.id(), + Self::Ospf(fabric_section) => fabric_section.id(), } } @@ -171,6 +180,7 @@ impl Fabric { pub fn ip_prefix(&self) -> Option { match self { Fabric::Openfabric(fabric_section) => fabric_section.ip_prefix(), + Fabric::Ospf(fabric_section) => fabric_section.ip_prefix(), } } @@ -180,6 +190,7 @@ impl Fabric { pub fn ip6_prefix(&self) -> Option { match self { Fabric::Openfabric(fabric_section) => fabric_section.ip6_prefix(), + Fabric::Ospf(fabric_section) => fabric_section.ip6_prefix(), } } } @@ -190,17 +201,25 @@ impl From> for Fabric { } } +impl From> for Fabric { + fn from(section: FabricSection) -> Self { + Fabric::Ospf(section) + } +} + /// Enum containing all updater types for fabrics #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(rename_all = "snake_case", tag = "protocol")] pub enum FabricUpdater { Openfabric( as UpdaterType>::Updater), + Ospf( as UpdaterType>::Updater), } impl Updater for FabricUpdater { fn is_empty(&self) -> bool { match self { FabricUpdater::Openfabric(updater) => updater.is_empty(), + FabricUpdater::Ospf(updater) => updater.is_empty(), } } } diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/node.rs b/proxmox-ve-config/src/sdn/fabric/section_config/node.rs index 510bfdeadb69..bd5ffea854d7 100644 --- a/proxmox-ve-config/src/sdn/fabric/section_config/node.rs +++ b/proxmox-ve-config/src/sdn/fabric/section_config/node.rs @@ -12,7 +12,7 @@ use proxmox_schema::{ use crate::sdn::fabric::section_config::{ fabric::{FabricId, FABRIC_ID_REGEX_STR}, - protocol::openfabric::OpenfabricNodeProperties, + protocol::{openfabric::OpenfabricNodeProperties, ospf::OspfNodeProperties}, }; pub const NODE_ID_REGEX_STR: &str = r"(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]){0,61}(?:[a-zA-Z0-9]){0,1})"; @@ -183,6 +183,7 @@ impl ApiType for NodeSection { #[serde(rename_all = "snake_case", tag = "protocol")] pub enum Node { Openfabric(NodeSection), + Ospf(NodeSection), } impl Node { @@ -190,6 +191,7 @@ impl Node { pub fn id(&self) -> &NodeSectionId { match self { Node::Openfabric(node_section) => node_section.id(), + Node::Ospf(node_section) => node_section.id(), } } @@ -197,6 +199,7 @@ impl Node { pub fn ip(&self) -> Option { match self { Node::Openfabric(node_section) => node_section.ip(), + Node::Ospf(node_section) => node_section.ip(), } } @@ -204,6 +207,7 @@ impl Node { pub fn ip6(&self) -> Option { match self { Node::Openfabric(node_section) => node_section.ip6(), + Node::Ospf(node_section) => node_section.ip6(), } } } @@ -213,3 +217,9 @@ impl From> for Node { Self::Openfabric(value) } } + +impl From> for Node { + fn from(value: NodeSection) -> Self { + Self::Ospf(value) + } +} diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs index e5b800ba495e..c1ec847ffbc3 100644 --- a/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs +++ b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/mod.rs @@ -1 +1,2 @@ pub mod openfabric; +pub mod ospf; 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 new file mode 100644 index 000000000000..8c94c9e10432 --- /dev/null +++ b/proxmox-ve-config/src/sdn/fabric/section_config/protocol/ospf.rs @@ -0,0 +1,88 @@ +use std::ops::Deref; + +use proxmox_network_types::ip_address::Ipv4Cidr; +use proxmox_sdn_types::area::Area; +use serde::{Deserialize, Serialize}; + +use proxmox_schema::{api, property_string::PropertyString, ApiStringFormat, Updater}; + +use crate::sdn::fabric::section_config::interface::InterfaceName; + +#[api] +#[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)] +/// Properties for an Ospf fabric. +pub struct OspfProperties { + /// OSPF area + pub(crate) area: Area, +} + +impl OspfProperties { + pub fn set_area(&mut self, value: Area) { + self.area = value; + } + pub fn area(&self) -> &Area { + &self.area + } +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "snake_case", untagged)] +pub enum OspfDeletableProperties {} + +#[api( + properties: { + interfaces: { + type: Array, + optional: true, + items: { + type: String, + description: "Properties for an Ospf interface.", + format: &ApiStringFormat::PropertyString(&OspfInterfaceProperties::API_SCHEMA), + } + }, + } +)] +#[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)] +/// Properties for an Ospf node. +pub struct OspfNodeProperties { + /// Interfaces for this Node. + #[serde(default)] + pub(crate) interfaces: Vec>, +} + +impl OspfNodeProperties { + pub fn interfaces(&self) -> impl Iterator { + self.interfaces + .iter() + .map(|property_string| property_string.deref()) + } +} + +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "snake_case", untagged)] +pub enum OspfNodeDeletableProperties { + Interfaces, +} + +#[api] +#[derive(Debug, Clone, Serialize, Deserialize, Updater, Hash)] +/// Properties for an OSPF interface. +pub struct OspfInterfaceProperties { + pub(crate) name: InterfaceName, + + /// If IP is unset, then this is an unnumbered interface + #[serde(skip_serializing_if = "Option::is_none")] + pub(crate) ip: Option, +} + +impl OspfInterfaceProperties { + /// Get the name of the OSPF interface. + pub fn name(&self) -> &InterfaceName { + &self.name + } + + /// Get the ip (IPv4) of the OSPF interface. + pub fn ip(&self) -> Option { + self.ip + } +} -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel