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 672B61FF165 for ; Thu, 22 May 2025 18:21:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 96D7AAD13; Thu, 22 May 2025 18:18:21 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 22 May 2025 18:16:37 +0200 Message-Id: <20250522161731.537011-22-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522161731.537011-1-s.hanreich@proxmox.com> References: <20250522161731.537011-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.229 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH proxmox-ve-rs v3 16/21] config: sdn: fabrics: add section config 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" The Section type represents the configuration as stored in '/etc/pve/sdn/fabrics.cfg'. It can contain a mix of fabric and node sections, which are in turn unique to each protocol. We utilize the generic FabricSection and NodeSection types to define every possible section type in the section config. We also provide a helper for sorting the sections in the configuration file into Fabrics and Nodes, as well as conversion from / to the Fabric and Node types. Co-authored-by: Gabriel Goller Signed-off-by: Stefan Hanreich --- .../src/sdn/fabric/section_config/mod.rs | 105 ++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/proxmox-ve-config/src/sdn/fabric/section_config/mod.rs b/proxmox-ve-config/src/sdn/fabric/section_config/mod.rs index 7db3788..174ea4d 100644 --- a/proxmox-ve-config/src/sdn/fabric/section_config/mod.rs +++ b/proxmox-ve-config/src/sdn/fabric/section_config/mod.rs @@ -2,3 +2,108 @@ pub mod fabric; pub mod interface; pub mod node; pub mod protocol; + +use const_format::concatcp; +use serde::{Deserialize, Serialize}; + +use crate::sdn::fabric::section_config::{ + fabric::{Fabric, FabricSection, FABRIC_ID_REGEX_STR}, + node::{Node, NodeSection, NODE_ID_REGEX_STR}, + protocol::{ + openfabric::{OpenfabricNodeProperties, OpenfabricProperties}, + ospf::{OspfNodeProperties, OspfProperties}, + }, +}; + +use proxmox_schema::{api, const_regex, ApiStringFormat}; + +/// Represents a value that can be one of two given types. +/// +/// This is used for the fabrics section config, where values could either be Fabrics or Nodes. It +/// can be used to split the sections contained in the config into their concrete types safely. +pub enum Either { + Left(L), + Right(R), +} + +impl From
for Either { + fn from(section: Section) -> Self { + match section { + Section::OpenfabricFabric(fabric_section) => Self::Left(fabric_section.into()), + Section::OspfFabric(fabric_section) => Self::Left(fabric_section.into()), + Section::OpenfabricNode(node_section) => Self::Right(node_section.into()), + Section::OspfNode(node_section) => Self::Right(node_section.into()), + } + } +} + +const_regex! { + pub SECTION_ID_REGEX = concatcp!(r"^", FABRIC_ID_REGEX_STR, r"(?:_", NODE_ID_REGEX_STR, r")?$"); +} + +pub const SECTION_ID_FORMAT: ApiStringFormat = ApiStringFormat::Pattern(&SECTION_ID_REGEX); + +/// A section in the SDN fabrics config. +/// +/// It contains two variants for every protocol: The fabric and the node. They are represented +/// respectively by [`FabricSection`] and [`NodeSection`] which encapsulate the common properties +/// of fabrics and nodes and take the specific properties for the protocol as a type parameter. +#[api( + "id-property": "id", + "id-schema": { + type: String, + description: "fabric/node id", + format: &SECTION_ID_FORMAT, + }, + "type-key": "type", +)] +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(rename_all = "snake_case", tag = "type")] +pub enum Section { + OpenfabricFabric(FabricSection), + OspfFabric(FabricSection), + OpenfabricNode(NodeSection), + OspfNode(NodeSection), +} + +impl From> for Section { + fn from(section: FabricSection) -> Self { + Self::OpenfabricFabric(section) + } +} + +impl From> for Section { + fn from(section: FabricSection) -> Self { + Self::OspfFabric(section) + } +} + +impl From> for Section { + fn from(section: NodeSection) -> Self { + Self::OpenfabricNode(section) + } +} + +impl From> for Section { + fn from(section: NodeSection) -> Self { + Self::OspfNode(section) + } +} + +impl From for Section { + fn from(fabric: Fabric) -> Self { + match fabric { + Fabric::Openfabric(fabric_section) => fabric_section.into(), + Fabric::Ospf(fabric_section) => fabric_section.into(), + } + } +} + +impl From for Section { + fn from(node: Node) -> Self { + match node { + Node::Openfabric(node_section) => node_section.into(), + Node::Ospf(node_section) => node_section.into(), + } + } +} -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel