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: [PATCH proxmox-perl-rs v2 2/2] sdn: add IS-IS fabric status reporting
Date: Thu, 19 Feb 2026 16:25:25 +0100	[thread overview]
Message-ID: <20260219152544.427439-6-g.goller@proxmox.com> (raw)
In-Reply-To: <20260219152544.427439-1-g.goller@proxmox.com>

Extend fabric status reporting to cover the IS-IS fabric alongside the
existing OpenFabric and OSPF support.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
 pve-rs/src/bindings/sdn/fabrics.rs | 99 ++++++++++++++++++++++++++++++
 pve-rs/src/sdn/status.rs           | 15 +++++
 2 files changed, 114 insertions(+)

diff --git a/pve-rs/src/bindings/sdn/fabrics.rs b/pve-rs/src/bindings/sdn/fabrics.rs
index c4150c830a0a..6f4207b24813 100644
--- a/pve-rs/src/bindings/sdn/fabrics.rs
+++ b/pve-rs/src/bindings/sdn/fabrics.rs
@@ -687,6 +687,41 @@ pub mod pve_rs_sdn_fabrics {
                     proxmox_sys::nodename(),
                 )
             }
+            FabricEntry::Isis(_) => {
+                let isis_ipv4_routes_string = String::from_utf8(
+                    Command::new("sh")
+                        .args(["-c", "vtysh -c 'show ip route isis json'"])
+                        .output()?
+                        .stdout,
+                )?;
+
+                let isis_ipv6_routes_string = String::from_utf8(
+                    Command::new("sh")
+                        .args(["-c", "vtysh -c 'show ipv6 route isis json'"])
+                        .output()?
+                        .stdout,
+                )?;
+
+                let mut isis_routes: proxmox_frr::de::Routes =
+                    if isis_ipv4_routes_string.is_empty() {
+                        proxmox_frr::de::Routes::default()
+                    } else {
+                        serde_json::from_str(&isis_ipv4_routes_string)
+                            .with_context(|| "error parsing isis ipv4 routes")?
+                    };
+                if !isis_ipv6_routes_string.is_empty() {
+                    let isis_ipv6_routes: proxmox_frr::de::Routes =
+                        serde_json::from_str(&isis_ipv6_routes_string)
+                            .with_context(|| "error parsing isis ipv6 routes")?;
+                    isis_routes.0.extend(isis_ipv6_routes.0);
+                }
+                status::get_routes(
+                    fabric_id,
+                    config,
+                    isis_routes,
+                    proxmox_sys::nodename(),
+                )
+            }
             FabricEntry::Ospf(_) => {
                 let ospf_routes_string = String::from_utf8(
                     Command::new("sh")
@@ -738,6 +773,23 @@ pub mod pve_rs_sdn_fabrics {
 
                 status::get_neighbors_openfabric(fabric_id, openfabric_neighbors).map(|v| v.into())
             }
+            FabricEntry::Isis(_) => {
+                let isis_neighbors_string = String::from_utf8(
+                    Command::new("sh")
+                        .args(["-c", "vtysh -c 'show isis neighbor detail json'"])
+                        .output()?
+                        .stdout,
+                )?;
+                let isis_neighbors: proxmox_frr::de::openfabric::Neighbors =
+                    if isis_neighbors_string.is_empty() {
+                        proxmox_frr::de::openfabric::Neighbors::default()
+                    } else {
+                        serde_json::from_str(&isis_neighbors_string)
+                            .with_context(|| "error parsing isis neighbors")?
+                    };
+
+                status::get_neighbors_openfabric(fabric_id, isis_neighbors).map(|v| v.into())
+            }
             FabricEntry::Ospf(fabric) => {
                 let ospf_neighbors_string = String::from_utf8(
                     Command::new("sh")
@@ -797,6 +849,24 @@ pub mod pve_rs_sdn_fabrics {
                 status::get_interfaces_openfabric(fabric_id, openfabric_interfaces)
                     .map(|v| v.into())
             }
+            FabricEntry::Isis(_) => {
+                let isis_interface_string = String::from_utf8(
+                    Command::new("sh")
+                        .args(["-c", "vtysh -c 'show isis interface json'"])
+                        .output()?
+                        .stdout,
+                )?;
+                let isis_interfaces: proxmox_frr::de::openfabric::Interfaces =
+                    if isis_interface_string.is_empty() {
+                        proxmox_frr::de::openfabric::Interfaces::default()
+                    } else {
+                        serde_json::from_str(&isis_interface_string)
+                            .with_context(|| "error parsing isis interfaces")?
+                    };
+
+                status::get_interfaces_openfabric(fabric_id, isis_interfaces)
+                    .map(|v| v.into())
+            }
             FabricEntry::Ospf(fabric) => {
                 let ospf_interfaces_string = String::from_utf8(
                     Command::new("sh")
@@ -852,6 +922,20 @@ pub mod pve_rs_sdn_fabrics {
                 .stdout,
         )?;
 
+        let isis_ipv4_routes_string = String::from_utf8(
+            Command::new("sh")
+                .args(["-c", "vtysh -c 'show ip route isis json'"])
+                .output()?
+                .stdout,
+        )?;
+
+        let isis_ipv6_routes_string = String::from_utf8(
+            Command::new("sh")
+                .args(["-c", "vtysh -c 'show ipv6 route isis json'"])
+                .output()?
+                .stdout,
+        )?;
+
         let ospf_routes_string = String::from_utf8(
             Command::new("sh")
                 .args(["-c", "vtysh -c 'show ip route ospf json'"])
@@ -873,6 +957,20 @@ pub mod pve_rs_sdn_fabrics {
             openfabric_routes.0.extend(openfabric_ipv6_routes.0);
         }
 
+        let mut isis_routes: proxmox_frr::de::Routes =
+            if isis_ipv4_routes_string.is_empty() {
+                proxmox_frr::de::Routes::default()
+            } else {
+                serde_json::from_str(&isis_ipv4_routes_string)
+                    .with_context(|| "error parsing isis ipv4 routes")?
+            };
+        if !isis_ipv6_routes_string.is_empty() {
+            let isis_ipv6_routes: proxmox_frr::de::Routes =
+                serde_json::from_str(&isis_ipv6_routes_string)
+                    .with_context(|| "error parsing isis ipv6 routes")?;
+            isis_routes.0.extend(isis_ipv6_routes.0);
+        }
+
         let ospf_routes: proxmox_frr::de::Routes = if ospf_routes_string.is_empty() {
             proxmox_frr::de::Routes::default()
         } else {
@@ -883,6 +981,7 @@ pub mod pve_rs_sdn_fabrics {
         let route_status = status::RoutesParsed {
             openfabric: openfabric_routes,
             ospf: ospf_routes,
+            isis: isis_routes,
         };
 
         status::get_status(config, route_status, proxmox_sys::nodename())
diff --git a/pve-rs/src/sdn/status.rs b/pve-rs/src/sdn/status.rs
index e1e336297ac9..a11603a8af22 100644
--- a/pve-rs/src/sdn/status.rs
+++ b/pve-rs/src/sdn/status.rs
@@ -135,6 +135,8 @@ pub enum Protocol {
     Openfabric,
     /// OSPF
     Ospf,
+    /// IS-IS
+    Isis,
 }
 
 /// The status of a fabric.
@@ -173,6 +175,8 @@ pub struct RoutesParsed {
     pub openfabric: de::Routes,
     /// All ospf routes in FRR
     pub ospf: de::Routes,
+    /// All isis routes in FRR
+    pub isis: de::Routes,
 }
 
 /// Config used to parse the fabric part of the running-config
@@ -217,6 +221,11 @@ pub fn get_routes(
                 .interfaces()
                 .map(|i| i.name().as_str())
                 .collect(),
+            ConfigNode::Isis(n) => n
+                .properties()
+                .interfaces()
+                .map(|i| i.name().as_str())
+                .collect(),
         };
 
         let dummy_interface = format!("dummy_{}", fabric_id.as_str());
@@ -429,6 +438,7 @@ pub fn get_status(
         let (current_protocol, all_routes) = match &node {
             ConfigNode::Openfabric(_) => (Protocol::Openfabric, &routes.openfabric.0),
             ConfigNode::Ospf(_) => (Protocol::Ospf, &routes.ospf.0),
+            ConfigNode::Isis(_) => (Protocol::Isis, &routes.isis.0),
         };
 
         // get interfaces
@@ -443,6 +453,11 @@ pub fn get_status(
                 .interfaces()
                 .map(|i| i.name().as_str())
                 .collect(),
+            ConfigNode::Isis(n) => n
+                .properties()
+                .interfaces()
+                .map(|i| i.name().as_str())
+                .collect(),
         };
 
         // determine status by checking if any routes exist for our interfaces
-- 
2.47.3





  parent reply	other threads:[~2026-02-19 15:26 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-02-19 15:25 [PATCH docs/gui-tests/manager/network/proxmox{-ve-rs,-perl-rs} v2 00/11] Add IS-IS protocol to fabrics Gabriel Goller
2026-02-19 15:25 ` [PATCH proxmox-ve-rs v2 1/3] frr: add fabric properties to ISIS types and rename domain Gabriel Goller
2026-02-19 15:25 ` [PATCH proxmox-ve-rs v2 2/3] ve-config: add IS-IS fabric config parsing and frr config generation Gabriel Goller
2026-02-19 15:25 ` [PATCH proxmox-ve-rs v2 3/3] ve-config: add integration tests for IS-IS fabrics Gabriel Goller
2026-02-19 15:25 ` [PATCH proxmox-perl-rs v2 1/2] pve-rs: fabrics: add IS-IS protocol ifupdown config generation Gabriel Goller
2026-02-19 15:25 ` Gabriel Goller [this message]
2026-02-19 15:25 ` [PATCH pve-network v2 1/2] fabrics: add IS-IS api types Gabriel Goller
2026-02-19 15:25 ` [PATCH pve-network v2 2/2] sdn: controllers: rename isis domain to fabric_id Gabriel Goller
2026-02-19 15:25 ` [PATCH pve-manager v2 1/2] fabrics: add IS-IS panels Gabriel Goller
2026-02-19 15:25 ` [PATCH pve-manager v2 2/2] sdn: add warning about IS-IS controller deprecation Gabriel Goller
2026-02-19 15:25 ` [PATCH pve-docs v2 1/1] sdn: add section about IS-IS fabric Gabriel Goller
2026-02-19 15:25 ` [PATCH pve-gui-tests v2 1/1] fabrics: add screenshots for IS-IS fabric and nodes 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=20260219152544.427439-6-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