all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-perl-rs 09/10] pve-rs: fabrics: add function to get the interfaces used for a fabric
Date: Thu, 30 Oct 2025 16:48:24 +0100	[thread overview]
Message-ID: <20251030154851.540408-18-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20251030154851.540408-1-s.hanreich@proxmox.com>

From: Gabriel Goller <g.goller@proxmox.com>

Add a function which queries FRR to return all the interfaces which are
used on the local node by a specific fabric. Again, we can associate a
fabric with a specific openfabric/ospf interface by reading and parsing
the fabric config and getting all the interfaces configured on the node
and matching them to the FRR output.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 pve-rs/src/bindings/sdn/fabrics.rs |  50 +++++++++++
 pve-rs/src/sdn/status.rs           | 133 ++++++++++++++++++++++++++++-
 2 files changed, 182 insertions(+), 1 deletion(-)

diff --git a/pve-rs/src/bindings/sdn/fabrics.rs b/pve-rs/src/bindings/sdn/fabrics.rs
index 5fbb67e..150b7fa 100644
--- a/pve-rs/src/bindings/sdn/fabrics.rs
+++ b/pve-rs/src/bindings/sdn/fabrics.rs
@@ -666,6 +666,56 @@ pub mod pve_rs_sdn_fabrics {
         }
     }
 
+    /// Get the interfaces for this specific fabric on this node
+    ///
+    /// Read and parse the fabric config to get the protocol of the fabric and retrieve the
+    /// interfaces (ospf). Convert the frr output into a common format of fabric interfaces.
+    #[export]
+    fn interfaces(fabric_id: FabricId) -> Result<status::InterfaceStatus, Error> {
+        // Read fabric config to get protocol of fabric
+        let config = get_fabrics_config()?;
+
+        let fabric = config.get_fabric(&fabric_id)?;
+
+        match fabric {
+            FabricEntry::Openfabric(_) => {
+                let openfabric_interface_string = String::from_utf8(
+                    Command::new("sh")
+                        .args(["-c", "vtysh -c 'show openfabric interface json'"])
+                        .output()?
+                        .stdout,
+                )?;
+                let openfabric_interfaces: proxmox_frr::de::openfabric::Interfaces =
+                    if openfabric_interface_string.is_empty() {
+                        proxmox_frr::de::openfabric::Interfaces::default()
+                    } else {
+                        serde_json::from_str(&openfabric_interface_string)
+                            .with_context(|| "error parsing openfabric interfaces")?
+                    };
+
+                status::get_interfaces_openfabric(fabric_id, openfabric_interfaces)
+                    .map(|v| v.into())
+            }
+            FabricEntry::Ospf(fabric) => {
+                let ospf_interfaces_string = String::from_utf8(
+                    Command::new("sh")
+                        .args(["-c", "vtysh -c 'show ip ospf interface json'"])
+                        .output()?
+                        .stdout,
+                )?;
+                let ospf_interfaces: proxmox_frr::de::ospf::Interfaces =
+                    if ospf_interfaces_string.is_empty() {
+                        proxmox_frr::de::ospf::Interfaces::default()
+                    } else {
+                        serde_json::from_str(&ospf_interfaces_string)
+                            .with_context(|| "error parsing ospf interfaces")?
+                    };
+
+                status::get_interfaces_ospf(fabric_id, fabric, ospf_interfaces).map(|v| v.into())
+            }
+        }
+    }
+
     /// Return the status of all fabrics on this node.
     ///
     /// Go through all fabrics in the config, then filter out the ones that exist on this node.
diff --git a/pve-rs/src/sdn/status.rs b/pve-rs/src/sdn/status.rs
index ba7fcf7..450bb6c 100644
--- a/pve-rs/src/sdn/status.rs
+++ b/pve-rs/src/sdn/status.rs
@@ -6,14 +6,79 @@ use proxmox_network_types::mac_address::MacAddress;
 use serde::{Deserialize, Serialize};
 
 use proxmox_frr::de::{self};
+use proxmox_ve_config::sdn::fabric::section_config::protocol::ospf::{
+    OspfNodeProperties, OspfProperties,
+};
 use proxmox_ve_config::{
     common::valid::Valid,
     sdn::fabric::{
-        FabricConfig,
+        Entry, FabricConfig,
         section_config::{Section, fabric::FabricId, node::Node as ConfigNode, node::NodeId},
     },
 };
 
+// The status of a fabric interface
+//
+// Either up or down.
+#[derive(Debug, Serialize)]
+#[serde(rename_all = "lowercase")]
+pub enum InterfaceState {
+    Up,
+    Down,
+}
+
+mod ospf {
+    use proxmox_frr::de;
+    use serde::Serialize;
+
+    /// The status of a fabric interface
+    ///
+    /// Contains the interface name, the interface state (so if the interface is up/down) and the type
+    /// of the interface (e.g. point-to-point, broadcast, etc.).
+    #[derive(Debug, Serialize)]
+    pub struct InterfaceStatus {
+        pub name: String,
+        pub state: super::InterfaceState,
+        #[serde(rename = "type")]
+        pub ty: de::ospf::NetworkType,
+    }
+}
+mod openfabric {
+    use proxmox_frr::de;
+    use serde::Serialize;
+
+    /// The status of a fabric interface
+    ///
+    /// Contains the interface name, the interface state (so if the interface is up/down) and the type
+    /// of the interface (e.g. point-to-point, broadcast, etc.).
+    #[derive(Debug, Serialize)]
+    pub struct InterfaceStatus {
+        pub name: String,
+        pub state: de::openfabric::CircuitState,
+        #[serde(rename = "type")]
+        pub ty: de::openfabric::NetworkType,
+    }
+}
+
+/// Common InterfaceStatus that contains either OSPF or Openfabric interfaces
+#[derive(Debug, Serialize)]
+#[serde(untagged)]
+pub enum InterfaceStatus {
+    Openfabric(Vec<openfabric::InterfaceStatus>),
+    Ospf(Vec<ospf::InterfaceStatus>),
+}
+
+impl From<Vec<openfabric::InterfaceStatus>> for InterfaceStatus {
+    fn from(value: Vec<openfabric::InterfaceStatus>) -> Self {
+        InterfaceStatus::Openfabric(value)
+    }
+}
+impl From<Vec<ospf::InterfaceStatus>> for InterfaceStatus {
+    fn from(value: Vec<ospf::InterfaceStatus>) -> Self {
+        InterfaceStatus::Ospf(value)
+    }
+}
+
 /// The status of a route.
 ///
 /// Contains the route and all the nexthops. This is common across all protocols.
@@ -165,6 +230,72 @@ pub fn get_routes(
     Ok(stats)
 }
 
+/// Conver the `show openfabric interface` output into a list of [`openfabric::InterfaceStatus`].
+///
+/// Openfabric uses the name of the fabric as an "area", so simply match that to the fabric_id.
+pub fn get_interfaces_openfabric(
+    fabric_id: FabricId,
+    interfaces: de::openfabric::Interfaces,
+) -> Result<Vec<openfabric::InterfaceStatus>, anyhow::Error> {
+    let mut stats: Vec<openfabric::InterfaceStatus> = Vec::new();
+
+    for area in &interfaces.areas {
+        if area.area == fabric_id.as_str() {
+            for circuit in &area.circuits {
+                stats.push(openfabric::InterfaceStatus {
+                    name: circuit.interface.name.clone(),
+                    state: circuit.interface.state,
+                    ty: circuit.interface.ty,
+                });
+            }
+        }
+    }
+
+    Ok(stats)
+}
+
+/// Convert the `show ip ospf interface` output into a list of [`ospf::InterfaceStatus`].
+///
+/// Ospf does not use the name of the fabric at all, so we again need to retrieve the interfaces of
+/// the fabric on this specific node and then match the interfaces to the fabric using the
+/// interface names.
+pub fn get_interfaces_ospf(
+    fabric_id: FabricId,
+    fabric: &Entry<OspfProperties, OspfNodeProperties>,
+    neighbors: de::ospf::Interfaces,
+) -> Result<Vec<ospf::InterfaceStatus>, anyhow::Error> {
+    let hostname = proxmox_sys::nodename();
+
+    let mut stats: Vec<ospf::InterfaceStatus> = Vec::new();
+
+    if let Ok(node) = fabric.node_section(&NodeId::from_string(hostname.to_string())?) {
+        let mut fabric_interface_names: HashSet<&str> = node
+            .properties()
+            .interfaces()
+            .map(|i| i.name().as_str())
+            .collect();
+
+        let dummy_interface = format!("dummy_{}", fabric_id.as_str());
+        fabric_interface_names.insert(&dummy_interface);
+
+        for (interface_name, interface) in &neighbors.interfaces {
+            if fabric_interface_names.contains(interface_name.as_str()) {
+                stats.push(ospf::InterfaceStatus {
+                    name: interface_name.to_string(),
+                    state: if interface.if_up {
+                        InterfaceState::Up
+                    } else {
+                        InterfaceState::Down
+                    },
+                    ty: interface.network_type,
+                });
+            }
+        }
+    }
+
+    Ok(stats)
+}
+
 /// Get the status for each fabric using the parsed routes from frr
 ///
 /// Using the parsed routes we get from frr, filter and map them to a HashMap mapping every
-- 
2.47.3


_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel


  parent reply	other threads:[~2025-10-30 15:49 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-10-30 15:48 [pve-devel] [PATCH common/manager/network/proxmox{-ve-rs, -perl-rs} 00/35] Improve status reporting for SDN / networking Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-common 1/2] iproute2: add helper for detecting bridge members Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-common 2/2] iproute2: add helper for querying vlan information Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-ve-rs 1/6] frr: make room for deserialization structs Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-ve-rs 2/6] frr: add deserialization types for openfabric and ospf Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-ve-rs 3/6] ve-config: add helper function to iterate over all nodes in all fabrics Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-ve-rs 4/6] ve-config: add optional tag property to vnet Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-ve-rs 5/6] frr: fix some route deserialization types Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-ve-rs 6/6] frr: add deserialization types for EVPN Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 01/10] pve-rs: firewall: cargo: fmt Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 02/10] pve-rs: firewall: add missing documentation comments Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 03/10] pve-rs: cargo: bump proxmox-apt and proxmox-ve-config versions Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 04/10] pve-rs: fabrics: update proxmox-frr import path Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 05/10] pve-rs: fabrics: fix clippy lint warnings Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 06/10] pve-rs: fabrics: add function to get status of fabric Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 07/10] pve-rs: fabrics: add function to get l2vpn and l3vpn routes for evpn Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 08/10] pve-rs: fabrics: add function to get routes learned by a fabric Stefan Hanreich
2025-10-30 15:48 ` Stefan Hanreich [this message]
2025-10-30 15:48 ` [pve-devel] [PATCH proxmox-perl-rs 10/10] pve-rs: fabrics: add function to get the neighbors for " Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 1/9] refactor: rework api module structure for the /nodes/{node}/sdn subdir Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 2/9] fabrics: add fabrics status to SDN::status function Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 3/9] sdn: status: add zone type to sdn resource Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 4/9] api: nodes: fabrics: add endpoint for querying route status Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 5/9] api: nodes: fabrics: add endpoint for querying neighbor information Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 6/9] api: nodes: fabrics: add endpoint for querying interface status Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 7/9] api: nodes: zones: add bridge status Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 8/9] api: nodes: zones: add ip vrf endpoint for evpn zones Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-network 9/9] api: nodes: vnets: add mac-vrf endpoint for evpn vnets Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 1/8] api: nodes: use new status module for sdn subdirectory Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 2/8] refactor: ui: sdn browser: parametrize zone content panel Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 3/8] pvestatd: add network resource to status reporting Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 4/8] pvestatd: sdn: adapt to changes in " Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 5/8] ui: resource tree: add network resource Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 6/8] ui: sdn browser: Add ip-vrf panel for evpn zones Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 7/8] ui: sdn browser: add mac vrf panel Stefan Hanreich
2025-10-30 15:48 ` [pve-devel] [PATCH pve-manager 8/8] ui: sdn browser: add zone bridge view Stefan Hanreich

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=20251030154851.540408-18-s.hanreich@proxmox.com \
    --to=s.hanreich@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal