public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Gabriel Goller <g.goller@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-perl-rs 6/7] perl-rs: sdn: OSPF perlmod methods
Date: Fri, 28 Mar 2025 18:13:13 +0100	[thread overview]
Message-ID: <20250328171340.885413-26-g.goller@proxmox.com> (raw)
In-Reply-To: <20250328171340.885413-1-g.goller@proxmox.com>

CRUD methods for perlmod that call the helper functions defined earlier.
Also add a method that returns the FRR daemons to be enabled and a
method that generates FRR configuration after validating it.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Co-authored-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 pve-rs/src/sdn/ospf.rs | 165 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 165 insertions(+)

diff --git a/pve-rs/src/sdn/ospf.rs b/pve-rs/src/sdn/ospf.rs
index f6aac0db83f1..63ce0d53ffb8 100644
--- a/pve-rs/src/sdn/ospf.rs
+++ b/pve-rs/src/sdn/ospf.rs
@@ -205,4 +205,169 @@ mod export {
             OspfSectionConfig::write_section_config("sdn/fabrics/ospf.cfg", &guard)
         }
     }
+
+    #[export(raw_return)]
+    fn running_config(
+        #[raw] class: Value,
+        raw_config: HashMap<String, OspfSectionConfig>,
+    ) -> 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 = OspfSectionConfig::parse_section_config("ospf.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<OspfSectionConfig>,
+    ) -> 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, "ospf".to_string()))
+    }
+
+    #[export]
+    fn add_fabric(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        new_config: AddFabric,
+    ) -> Result<(), Error> {
+        this.add_fabric(new_config)?;
+
+        Ok(())
+    }
+
+    #[export]
+    fn add_node(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        new_config: AddNode,
+    ) -> Result<(), Error> {
+        this.add_node(new_config)
+    }
+
+    #[export]
+    fn edit_fabric(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        new_config: EditFabric,
+    ) -> Result<(), Error> {
+        this.edit_fabric(new_config)
+    }
+
+    #[export]
+    fn edit_node(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        new_config: EditNode,
+    ) -> Result<(), Error> {
+        this.edit_node(new_config)
+    }
+
+    #[export]
+    fn delete_fabric(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        delete_config: DeleteFabric,
+    ) -> Result<(), Error> {
+        this.delete_fabric(delete_config)?;
+
+        Ok(())
+    }
+
+    #[export]
+    fn delete_node(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        delete_config: DeleteNode,
+    ) -> Result<(), Error> {
+        this.delete_node(delete_config)?;
+
+        Ok(())
+    }
+
+    #[export]
+    fn get_inner(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+    ) -> HashMap<String, OspfSectionConfig> {
+        let guard = this.section_config.lock().unwrap();
+        guard.clone().into_iter().collect()
+    }
+
+    #[export]
+    fn get_fabric(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        fabric: Area,
+    ) -> Result<OspfSectionConfig, Error> {
+        let guard = this.section_config.lock().unwrap();
+        guard
+            .get(&fabric.to_string())
+            .cloned()
+            .ok_or(anyhow::anyhow!("fabric not found"))
+    }
+
+    #[export]
+    fn get_node(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        fabric: Area,
+        node: Hostname,
+    ) -> Result<OspfSectionConfig, 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<OspfSectionConfig>,
+        host_name: Hostname,
+    ) -> Vec<String> {
+        let config = this.section_config.lock().unwrap();
+
+        for (_, section) in config.iter() {
+            if let OspfSectionConfig::Node(node) = section {
+                if node.node_id.node == host_name {
+                    return vec!["ospfd".to_string()];
+                }
+            }
+        }
+
+        Vec::new()
+    }
+
+    #[export]
+    pub fn get_frr_raw_config(
+        #[try_from_ref] this: &PerlSectionConfig<OspfSectionConfig>,
+        node: Hostname,
+    ) -> Result<Vec<String>, Error> {
+        let config = this.section_config.lock().unwrap();
+        let ospf_config: Valid<OspfSectionConfig> = OspfSectionConfig::validate(config.clone())?;
+
+        let config = FabricConfig::with_ospf(ospf_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


  parent reply	other threads:[~2025-03-28 17:18 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-28 17:12 [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox 1/1] serde: add string_as_bool module for boolean string parsing Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 01/17] add proxmox-network-types crate Gabriel Goller
2025-03-31 14:09   ` Thomas Lamprecht
2025-03-31 14:38     ` Stefan Hanreich
2025-03-31 16:20       ` Thomas Lamprecht
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 02/17] network-types: add common hostname and openfabric types Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 03/17] network-types: add openfabric NET type Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 04/17] network-types: move Ipv4Cidr and Ipv6Cidr types Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 05/17] frr: create proxmox-frr crate Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 06/17] frr: add common frr types Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 07/17] frr: add openfabric types Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 08/17] frr: add ospf types Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 09/17] frr: add route-map types Gabriel Goller
2025-03-28 17:12 ` [pve-devel] [PATCH proxmox-ve-rs 10/17] frr: add generic types over openfabric and ospf Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 11/17] frr: add serializer for all FRR types Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 12/17] ve-config: add openfabric section-config Gabriel Goller
2025-03-31 13:48   ` Christoph Heiss
2025-03-31 15:04     ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 13/17] ve-config: add ospf section-config Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 14/17] ve-config: add FRR conversion helpers for openfabric and ospf Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 15/17] ve-config: add validation for section-config Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 16/17] ve-config: add section-config to frr types conversion Gabriel Goller
2025-03-31 13:51   ` Christoph Heiss
2025-03-31 14:31     ` Stefan Hanreich
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-ve-rs 17/17] ve-config: add integrations tests Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-firewall 1/1] firewall: nftables: migrate to proxmox-network-types Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 1/7] perl-rs: sdn: initial fabric infrastructure Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 2/7] perl-rs: sdn: add CRUD helpers for OpenFabric fabric management Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 3/7] perl-rs: sdn: OpenFabric perlmod methods Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 4/7] perl-rs: sdn: implement OSPF interface file configuration generation Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 5/7] perl-rs: sdn: add CRUD helpers for OSPF fabric management Gabriel Goller
2025-03-28 17:13 ` Gabriel Goller [this message]
2025-03-28 17:13 ` [pve-devel] [PATCH proxmox-perl-rs 7/7] perl-rs: sdn: implement OSPF interface file configuration generation Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-cluster 1/1] cluster: add sdn fabrics config files Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 01/17] sdn: fix value returned by pending_config Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 02/17] debian: add dependency to proxmox-perl-rs Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 03/17] fabrics: add fabrics module Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 04/17] refactor: controller: move frr methods into helper Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 05/17] controllers: implement new api for frr config generation Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 06/17] sdn: add frr config generation helper Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 07/17] test: isis: add test for standalone configuration Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 08/17] sdn: frr: add daemon status to frr helper Gabriel Goller
2025-04-02 10:41   ` Fabian Grünbichler
2025-04-02 10:50     ` Stefan Hanreich
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 09/17] sdn: running: apply fabrics config Gabriel Goller
2025-04-02 10:41   ` Fabian Grünbichler
2025-04-02 12:26     ` Stefan Hanreich
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 10/17] fabrics: generate ifupdown configuration Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 11/17] api: add fabrics subfolder Gabriel Goller
2025-04-02 10:41   ` Fabian Grünbichler
2025-04-02 12:20     ` Stefan Hanreich
2025-04-02 12:29       ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 12/17] api: fabrics: add common helpers Gabriel Goller
2025-04-02 10:41   ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 13/17] fabric: openfabric: add api endpoints Gabriel Goller
2025-04-02 10:37   ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 14/17] fabric: ospf: " Gabriel Goller
2025-04-02 10:37   ` Fabian Grünbichler
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 15/17] test: fabrics: add test cases for ospf and openfabric + evpn Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 16/17] frr: bump frr config version to 10.2.1 Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-network 17/17] frr: fix reloading frr configuration Gabriel Goller
2025-04-02 10:37   ` Fabian Grünbichler
2025-04-02 10:42     ` Stefan Hanreich
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 1/7] api: use new generalized frr and etc network config helper functions Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 2/7] fabrics: add common interface panel Gabriel Goller
2025-04-02  9:26   ` Friedrich Weber
2025-04-02 10:04     ` Gabriel Goller
2025-04-02 10:10       ` Friedrich Weber
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 3/7] fabrics: add additional interface fields for openfabric and ospf Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 4/7] fabrics: add FabricEdit components Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 5/7] fabrics: add NodeEdit components Gabriel Goller
2025-04-03  9:16   ` Christoph Heiss
2025-04-04 15:45     ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 6/7] fabrics: Add main FabricView Gabriel Goller
2025-04-02  9:26   ` Friedrich Weber
2025-04-02  9:50   ` Christoph Heiss
2025-04-02 10:40     ` Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-manager 7/7] utils: avoid line-break in pending changes message Gabriel Goller
2025-03-28 17:13 ` [pve-devel] [PATCH pve-docs 1/1] fabrics: add initial documentation for sdn fabrics Gabriel Goller
2025-03-31  8:44   ` Shannon Sterz
2025-03-31 12:24     ` Gabriel Goller
2025-04-02  8:43       ` Gabriel Goller
2025-04-02  8:49   ` Christoph Heiss
2025-04-02  9:09     ` Gabriel Goller
2025-04-02  9:16       ` Christoph Heiss
2025-04-03  8:30 ` [pve-devel] [PATCH cluster/docs/manager/network/proxmox{, -ve-rs, -firewall, -perl-rs} 00/52] Add SDN Fabrics Friedrich Weber
2025-04-03 10:21   ` Gabriel Goller
2025-04-03 13:44     ` Friedrich Weber
2025-04-03 14:03       ` Stefan Hanreich
2025-04-03 14:20         ` Friedrich Weber
2025-04-04  7:53           ` Stefan Hanreich
2025-04-04 10:55 ` Hannes Duerr
2025-04-04 12:48   ` Gabriel Goller
2025-04-04 12:53     ` Hannes Duerr
2025-04-04 14:26       ` Gabriel Goller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250328171340.885413-26-g.goller@proxmox.com \
    --to=g.goller@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal