From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 487331FF164 for <inbox@lore.proxmox.com>; Fri, 28 Mar 2025 18:14:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 505418359; Fri, 28 Mar 2025 18:13:56 +0100 (CET) From: Gabriel Goller <g.goller@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 28 Mar 2025 18:13:03 +0100 Message-Id: <20250328171340.885413-16-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250328171340.885413-1-g.goller@proxmox.com> References: <20250328171340.885413-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.025 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 14/17] ve-config: add FRR conversion helpers for openfabric and ospf X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> Add conversion helpers for FRR interfaces. We can't put these in eg. `TryInto` implementations, as we need a tupel and tupels are foreign types. Create a simple conversion function that converts the OpenFabric and OSPF interfaces to FRR interfaces. Signed-off-by: Gabriel Goller <g.goller@proxmox.com> --- .../src/sdn/fabric/openfabric/frr.rs | 24 +++++++++++++++ proxmox-ve-config/src/sdn/fabric/ospf/frr.rs | 29 +++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs create mode 100644 proxmox-ve-config/src/sdn/fabric/ospf/frr.rs diff --git a/proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs b/proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs new file mode 100644 index 000000000000..682fe62ab72f --- /dev/null +++ b/proxmox-ve-config/src/sdn/fabric/openfabric/frr.rs @@ -0,0 +1,24 @@ +use proxmox_frr::{ + openfabric::{OpenFabricInterface, OpenFabricInterfaceError}, + FrrWord, +}; + +use super::{FabricId, InterfaceProperties}; + +impl InterfaceProperties { + pub fn to_frr_interface( + &self, + fabric_id: &FabricId, + is_ipv6: bool, + ) -> Result<OpenFabricInterface, OpenFabricInterfaceError> { + let frr_word = FrrWord::new(fabric_id.to_string())?; + Ok(OpenFabricInterface { + fabric_id: frr_word.into(), + passive: self.passive(), + hello_interval: self.hello_interval, + csnp_interval: self.csnp_interval, + hello_multiplier: self.hello_multiplier, + is_ipv6, + }) + } +} diff --git a/proxmox-ve-config/src/sdn/fabric/ospf/frr.rs b/proxmox-ve-config/src/sdn/fabric/ospf/frr.rs new file mode 100644 index 000000000000..9d493b60efd5 --- /dev/null +++ b/proxmox-ve-config/src/sdn/fabric/ospf/frr.rs @@ -0,0 +1,29 @@ +use proxmox_frr::{ + ospf::{NetworkType, OspfInterface, OspfInterfaceError, OspfRouter}, + FrrWord, +}; + +use super::{Area, InterfaceProperties, NodeSection}; + +impl From<NodeSection> for OspfRouter { + fn from(val: NodeSection) -> Self { + OspfRouter { + router_id: val.router_id, + } + } +} + +impl InterfaceProperties { + pub fn to_frr_interface(&self, area: &Area) -> Result<OspfInterface, OspfInterfaceError> { + let frr_word = FrrWord::new(area.to_string())?; + Ok(OspfInterface { + area: frr_word.try_into()?, + passive: self.passive, + network_type: if let Some(true) = self.unnumbered { + Some(NetworkType::PointToPoint) + } else { + None + }, + }) + } +} -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel