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 v3 10/32] pve-rs: fabrics: make per-fabric status queries VRF-aware
Date: Mon, 16 Nov 2026 17:11:30 +0100	[thread overview]
Message-ID: <20261116161154.343743-11-g.goller@proxmox.com> (raw)
In-Reply-To: <20261116161154.343743-1-g.goller@proxmox.com>

Use the fabric VRF in FRR route, neighbor, and interface queries for
OSPF and BGP.

Keep the existing commands for fabrics in the default routing table.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
 pve-rs/src/bindings/sdn/fabrics.rs | 63 +++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/pve-rs/src/bindings/sdn/fabrics.rs b/pve-rs/src/bindings/sdn/fabrics.rs
index b7c2d91e5471..381de692acfc 100644
--- a/pve-rs/src/bindings/sdn/fabrics.rs
+++ b/pve-rs/src/bindings/sdn/fabrics.rs
@@ -841,6 +841,7 @@ pub mod pve_rs_sdn_fabrics {
         };
 
         let fabric = config.get_fabric(&fabric_id)?;
+        let vrf = fabric.fabric_vrf_name();
         match fabric {
             FabricEntry::Openfabric(_) => {
                 let openfabric_ipv4_routes_string = String::from_utf8(
@@ -878,12 +879,12 @@ pub mod pve_rs_sdn_fabrics {
                 )
             }
             FabricEntry::Ospf(_) => {
-                let ospf_routes_string = String::from_utf8(
-                    Command::new("sh")
-                        .args(["-c", "vtysh -c 'show ip route ospf json'"])
-                        .output()?
-                        .stdout,
-                )?;
+                let command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show ip route vrf {vrf} ospf json'"),
+                    None => "vtysh -c 'show ip route ospf json'".to_string(),
+                };
+                let ospf_routes_string =
+                    String::from_utf8(Command::new("sh").args(["-c", &command]).output()?.stdout)?;
                 let ospf_routes: proxmox_frr::de::Routes = if ospf_routes_string.is_empty() {
                     proxmox_frr::de::Routes::default()
                 } else {
@@ -895,10 +896,18 @@ pub mod pve_rs_sdn_fabrics {
             }
             FabricEntry::WireGuard(_) => Ok(Vec::new()),
             FabricEntry::Bgp(_) => {
+                let ipv4_command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show ip route vrf {vrf} bgp json'"),
+                    None => "vtysh -c 'show ip route bgp json'".to_string(),
+                };
+                let ipv6_command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show ipv6 route vrf {vrf} bgp json'"),
+                    None => "vtysh -c 'show ipv6 route bgp json'".to_string(),
+                };
                 let bgp_ipv4_routes_string = String::from_utf8(
                     Command::new("sh")
                         .env("VTYSH_HISTFILE", "/dev/null")
-                        .args(["-c", "vtysh -c 'show ip route bgp json'"])
+                        .args(["-c", &ipv4_command])
                         .output()?
                         .stdout,
                 )?;
@@ -906,7 +915,7 @@ pub mod pve_rs_sdn_fabrics {
                 let bgp_ipv6_routes_string = String::from_utf8(
                     Command::new("sh")
                         .env("VTYSH_HISTFILE", "/dev/null")
-                        .args(["-c", "vtysh -c 'show ipv6 route bgp json'"])
+                        .args(["-c", &ipv6_command])
                         .output()?
                         .stdout,
                 )?;
@@ -941,6 +950,7 @@ pub mod pve_rs_sdn_fabrics {
         };
 
         let fabric = config.get_fabric(&fabric_id)?;
+        let vrf = fabric.fabric_vrf_name();
 
         match fabric {
             FabricEntry::Openfabric(_) => {
@@ -961,12 +971,12 @@ pub mod pve_rs_sdn_fabrics {
                 status::get_neighbors_openfabric(fabric_id, openfabric_neighbors).map(|v| v.into())
             }
             FabricEntry::Ospf(fabric) => {
-                let ospf_neighbors_string = String::from_utf8(
-                    Command::new("sh")
-                        .args(["-c", "vtysh -c 'show ip ospf neighbor json'"])
-                        .output()?
-                        .stdout,
-                )?;
+                let command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show ip ospf vrf {vrf} neighbor json'"),
+                    None => "vtysh -c 'show ip ospf neighbor json'".to_string(),
+                };
+                let ospf_neighbors_string =
+                    String::from_utf8(Command::new("sh").args(["-c", &command]).output()?.stdout)?;
                 let ospf_neighbors: proxmox_frr::de::ospf::Neighbors =
                     if ospf_neighbors_string.is_empty() {
                         proxmox_frr::de::ospf::Neighbors::default()
@@ -985,10 +995,14 @@ pub mod pve_rs_sdn_fabrics {
             }
             FabricEntry::WireGuard(_) => Ok(status::NeighborStatus::WireGuard(Vec::new())),
             FabricEntry::Bgp(_) => {
+                let command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show bgp vrf {vrf} neighbors json'"),
+                    None => "vtysh -c 'show bgp neighbors json'".to_string(),
+                };
                 let bgp_neighbors_string = String::from_utf8(
                     Command::new("sh")
                         .env("VTYSH_HISTFILE", "/dev/null")
-                        .args(["-c", "vtysh -c 'show bgp neighbors json'"])
+                        .args(["-c", &command])
                         .output()?
                         .stdout,
                 )?;
@@ -1018,6 +1032,7 @@ pub mod pve_rs_sdn_fabrics {
         };
 
         let fabric = config.get_fabric(&fabric_id)?;
+        let vrf = fabric.fabric_vrf_name();
 
         match fabric {
             FabricEntry::Openfabric(_) => {
@@ -1039,12 +1054,12 @@ pub mod pve_rs_sdn_fabrics {
                     .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 command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show ip ospf vrf {vrf} interface json'"),
+                    None => "vtysh -c 'show ip ospf interface json'".to_string(),
+                };
+                let ospf_interfaces_string =
+                    String::from_utf8(Command::new("sh").args(["-c", &command]).output()?.stdout)?;
                 let ospf_interfaces: proxmox_frr::de::ospf::Interfaces =
                     if ospf_interfaces_string.is_empty() {
                         proxmox_frr::de::ospf::Interfaces::default()
@@ -1063,10 +1078,14 @@ pub mod pve_rs_sdn_fabrics {
             }
             FabricEntry::WireGuard(_) => Ok(status::InterfaceStatus::WireGuard(Vec::new())),
             FabricEntry::Bgp(_) => {
+                let command = match &vrf {
+                    Some(vrf) => format!("vtysh -c 'show bgp vrf {vrf} neighbors json'"),
+                    None => "vtysh -c 'show bgp neighbors json'".to_string(),
+                };
                 let bgp_neighbors_string = String::from_utf8(
                     Command::new("sh")
                         .env("VTYSH_HISTFILE", "/dev/null")
-                        .args(["-c", "vtysh -c 'show bgp neighbors json'"])
+                        .args(["-c", &command])
                         .output()?
                         .stdout,
                 )?;
-- 
2.47.3





  parent reply	other threads:[~2026-11-16 16:13 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16 16:11 [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/32] SDN VRF support Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-common v3 01/32] interfaces: preserve VRF membership across address family changes Gabriel Goller
2026-11-18 14:13   ` Stefan Hanreich
2026-11-18 15:41     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 02/32] frr: add VRF-aware OSPF rendering Gabriel Goller
2026-11-18 14:41   ` Stefan Hanreich
2026-11-18 16:21     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 03/32] sdn: add zone references to OSPF and BGP fabrics Gabriel Goller
2026-11-18 14:10   ` Stefan Hanreich
2026-11-18 16:55     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 04/32] sdn: generate fabric routing configuration in zone VRFs Gabriel Goller
2026-11-18 14:53   ` Stefan Hanreich
2026-11-18 17:26     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 05/32] sdn: fix VRF route-map scoping and zone ID validation Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 06/32] tests: fabrics: add test for fabrics in VRFs Gabriel Goller
2026-11-18 15:01   ` Stefan Hanreich
2026-11-18 17:33     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 07/32] sdn: allow static routes in simple zone VRFs Gabriel Goller
2026-11-18 15:29   ` Stefan Hanreich
2026-11-18 18:10     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-ve-rs v3 08/32] sdn: support static routes in EVPN " Gabriel Goller
2026-11-18 15:32   ` Stefan Hanreich
2026-11-19 13:12     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 09/32] pve-rs: fabrics: assign network interfaces to configured VRFs Gabriel Goller
2026-11-16 16:11 ` Gabriel Goller [this message]
2026-11-18 15:42   ` [PATCH proxmox-perl-rs v3 10/32] pve-rs: fabrics: make per-fabric status queries VRF-aware Stefan Hanreich
2026-11-19 13:30     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 11/32] pve-rs: fabrics: include VRF routes in aggregate status Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 12/32] pve-rs: fabrics: expose host interface membership Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-perl-rs v3 13/32] sdn: expose static routes for simple zone uplinks Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 14/32] sdn: evpn: add unreachable IPv6 default route to zone VRFs Gabriel Goller
2026-11-18 16:08   ` Stefan Hanreich
2026-11-18 16:39     ` Stefan Hanreich
2026-11-19 13:38       ` Gabriel Goller
2026-11-19 15:51         ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 15/32] sdn: add optional VRFs for simple zones Gabriel Goller
2026-11-18 16:18   ` Stefan Hanreich
2026-11-19 13:44     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 16/32] sdn: allow fabrics to use simple zone VRFs Gabriel Goller
2026-11-18 16:27   ` Stefan Hanreich
2026-11-19 14:14     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 17/32] sdn: require underlay fabrics to use the default VRF Gabriel Goller
2026-11-18 16:30   ` Stefan Hanreich
2026-11-19 14:33     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 18/32] sdn: always generate EVPN zone VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 19/32] api: sdn: allow EVPN zones as fabric VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 20/32] api: sdn: disallow BGP fabrics in EVPN zone VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 21/32] sdn: simple: support static routes in zone routing tables Gabriel Goller
2026-11-18 16:49   ` Stefan Hanreich
2026-11-19 14:53     ` Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 22/32] sdn: evpn: allow static routes Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 23/32] sdn: zones: SNAT via dedicated uplinks in zone VRFs Gabriel Goller
2026-11-18 18:07   ` Stefan Hanreich
2026-11-16 16:11 ` [PATCH pve-network v3 24/32] sdn: dhcp: only configure DHCP for zones on the local node Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-network v3 25/32] sdn: dhcp: run dnsmasq in the zone VRF Gabriel Goller
2026-11-16 16:11 ` [PATCH proxmox-widget-toolkit v3 26/32] ui: network: allow selecting a VRF for host interfaces Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 27/32] ui: sdn: add VRF zone selection for fabrics Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 28/32] ui: sdn: expose EVPN zones as fabric VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 29/32] network: allow setting the VRF of host interfaces Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 30/32] ui: sdn: allow static routes for Simple zone VRFs Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 31/32] ui: sdn: allow static routes in EVPN zones Gabriel Goller
2026-11-16 16:11 ` [PATCH pve-manager v3 32/32] network: generate SDN DHCP config after ifreload Gabriel Goller
2026-11-18 18:27 ` [PATCH common/manager/network/proxmox{-ve-rs,-perl-rs,-widget-toolkit} v3 00/32] SDN VRF support Stefan Hanreich
2026-11-19 15:33   ` Gabriel Goller
2026-11-19 20:10 ` 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=20261116161154.343743-11-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