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 743021FF15C
for <inbox@lore.proxmox.com>; Fri, 4 Apr 2025 18:30:37 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 85F553784C;
Fri, 4 Apr 2025 18:29:29 +0200 (CEST)
From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Fri, 4 Apr 2025 18:28:30 +0200
Message-Id: <20250404162908.563060-20-g.goller@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250404162908.563060-1-g.goller@proxmox.com>
References: <20250404162908.563060-1-g.goller@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.023 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-perl-rs v2 3/7] perl-rs: sdn: OpenFabric
perlmod methods
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 perlmod methods that call the previously introduced CRUD helpers.
Also add a method that returns the FRR daemons to be enabled by
pve-network and a method to validate and generate the FRR config.
Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
pve-rs/src/sdn/openfabric.rs | 174 ++++++++++++++++++++++++++++++++++-
1 file changed, 171 insertions(+), 3 deletions(-)
diff --git a/pve-rs/src/sdn/openfabric.rs b/pve-rs/src/sdn/openfabric.rs
index 569775857755..e7d46ee765bc 100644
--- a/pve-rs/src/sdn/openfabric.rs
+++ b/pve-rs/src/sdn/openfabric.rs
@@ -1,15 +1,17 @@
#[perlmod::package(name = "PVE::RS::SDN::Fabrics::OpenFabric", lib = "pve_rs")]
mod export {
- use std::{net::IpAddr, str};
+ use std::{collections::HashMap, net::IpAddr, str, sync::Mutex};
- use anyhow::Context;
+ use anyhow::{Context, Error};
+ use perlmod::Value;
+ use proxmox_frr::serializer::to_raw_config;
use proxmox_network_types::{debian::Hostname, ip_address::Cidr};
use proxmox_schema::property_string::PropertyString;
use proxmox_sdn_types::openfabric::{CsnpInterval, HelloInterval, HelloMultiplier};
use proxmox_section_config::typed::{ApiSectionDataEntry, SectionConfigData};
use proxmox_ve_config::sdn::fabric::{
- FabricId, NodeId, SectionType, Validate,
+ FabricConfig, FabricId, FrrConfigBuilder, NodeId, SectionType, Valid, Validate,
openfabric::{FabricSection, InterfaceProperties, NodeSection, OpenFabricSectionConfig},
};
use serde::{Deserialize, Serialize};
@@ -219,4 +221,170 @@ mod export {
OpenFabricSectionConfig::write_section_config("sdn/fabrics/openfabric.cfg", &guard)
}
}
+
+ #[export(raw_return)]
+ fn running_config(
+ #[raw] class: Value,
+ raw_config: HashMap<String, OpenFabricSectionConfig>,
+ ) -> Result<perlmod::Value, anyhow::Error> {
+ // we cannot just construct it from the HashMap via From, since then the order is empty
+ let section_config = raw_config.into_iter().collect();
+
+ let return_value = PerlSectionConfig {
+ section_config: Mutex::new(section_config),
+ };
+
+ Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new(
+ return_value
+ )))
+ }
+
+ #[export(raw_return)]
+ fn config(#[raw] class: Value, raw_config: &[u8]) -> Result<perlmod::Value, anyhow::Error> {
+ let raw_config = std::str::from_utf8(raw_config)?;
+
+ let config = OpenFabricSectionConfig::parse_section_config("openfabric.cfg", raw_config)?;
+ let return_value = PerlSectionConfig {
+ section_config: Mutex::new(config),
+ };
+
+ Ok(perlmod::instantiate_magic!(&class, MAGIC => Box::new(
+ return_value
+ )))
+ }
+
+ /// Writes the config to a string and returns the configuration and the protocol.
+ #[export]
+ fn write(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ ) -> Result<(String, String), Error> {
+ let full_new_config = this.write()?;
+
+ // We return the protocol here as well, so that in perl we can write to
+ // the correct config file
+ Ok((full_new_config, "openfabric".to_string()))
+ }
+
+ #[export]
+ fn add_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ params: AddFabric,
+ ) -> Result<(), Error> {
+ this.add_fabric(params)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn add_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ params: AddNode,
+ ) -> Result<(), Error> {
+ this.add_node(params)
+ }
+
+ #[export]
+ fn edit_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ params: EditFabric,
+ ) -> Result<(), Error> {
+ this.edit_fabric(params)
+ }
+
+ #[export]
+ fn edit_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ params: EditNode,
+ ) -> Result<(), Error> {
+ this.edit_node(params)
+ }
+
+ #[export]
+ fn delete_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ params: DeleteFabric,
+ ) -> Result<(), Error> {
+ this.delete_fabric(params)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn delete_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ params: DeleteNode,
+ ) -> Result<(), Error> {
+ this.delete_node(params)?;
+
+ Ok(())
+ }
+
+ #[export]
+ fn get_inner(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ ) -> HashMap<String, OpenFabricSectionConfig> {
+ let guard = this.section_config.lock().unwrap();
+ guard.clone().into_iter().collect()
+ }
+
+ #[export]
+ fn get_fabric(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ fabric: FabricId,
+ ) -> Result<OpenFabricSectionConfig, Error> {
+ let guard = this.section_config.lock().unwrap();
+ guard
+ .get(fabric.as_ref())
+ .cloned()
+ .ok_or(anyhow::anyhow!("fabric not found"))
+ }
+
+ #[export]
+ fn get_node(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ fabric: FabricId,
+ node: Hostname,
+ ) -> Result<OpenFabricSectionConfig, Error> {
+ let guard = this.section_config.lock().unwrap();
+ let nodeid = NodeId::new(fabric, node).to_string();
+ guard
+ .get(&nodeid)
+ .cloned()
+ .ok_or(anyhow::anyhow!("node not found"))
+ }
+
+ #[export]
+ pub fn enabled_daemons(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ hostname: Hostname,
+ ) -> Vec<String> {
+ let config = this.section_config.lock().unwrap();
+
+ for (_, section) in config.iter() {
+ if let OpenFabricSectionConfig::Node(node_config) = section {
+ if node_config.node_id == hostname {
+ return vec!["fabricd".to_string()];
+ }
+ }
+ }
+
+ Vec::new()
+ }
+
+ #[export]
+ pub fn get_frr_raw_config(
+ #[try_from_ref] this: &PerlSectionConfig<OpenFabricSectionConfig>,
+ node: Hostname,
+ ) -> Result<Vec<String>, Error> {
+ let config = this.section_config.lock().unwrap();
+ let openfabric_config: Valid<OpenFabricSectionConfig> =
+ OpenFabricSectionConfig::validate(config.clone())?;
+
+ let config = FabricConfig::with_openfabric(openfabric_config);
+ let frr_config = FrrConfigBuilder::default()
+ .add_fabrics(config)
+ .build(node)?;
+
+ to_raw_config(&frr_config)
+ }
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel