From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 8FA3F1FF0DA for ; Thu, 19 Nov 2026 20:42:34 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 8D3CB21855; Thu, 19 Nov 2026 20:41:49 +0100 (CET) From: Gabriel Goller To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-perl-rs v3 09/28] pve-rs: fabrics: make per-fabric status queries VRF-aware Date: Thu, 19 Nov 2026 20:40:55 +0100 Message-ID: <20261119194116.575520-10-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261119194116.575520-1-g.goller@proxmox.com> References: <20261119194116.575520-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795117281916 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.231 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: AF55PLK4VYHAMAVLB4DKAT4AO3HYYOF3 X-Message-ID-Hash: AF55PLK4VYHAMAVLB4DKAT4AO3HYYOF3 X-MailFrom: g.goller@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- pve-rs/src/bindings/sdn/fabrics.rs | 101 ++++++++++++++++------------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/pve-rs/src/bindings/sdn/fabrics.rs b/pve-rs/src/bindings/sdn/fabrics.rs index b7c2d91e5471..06ecd0d07eaf 100644 --- a/pve-rs/src/bindings/sdn/fabrics.rs +++ b/pve-rs/src/bindings/sdn/fabrics.rs @@ -827,6 +827,23 @@ pub mod pve_rs_sdn_fabrics { .transpose() } + /// Run a single `vtysh` command and return its stdout. + /// + /// The command is passed as a single argument, so it is not interpreted by a shell. Like + /// before, when it was run through `sh`, a missing `vtysh` binary yields empty output. + fn vtysh(command: &str) -> Result { + let output = match Command::new("vtysh") + .env("VTYSH_HISTFILE", "/dev/null") + .args(["-c", command]) + .output() + { + Ok(output) => output, + Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(String::new()), + Err(err) => return Err(err.into()), + }; + Ok(String::from_utf8(output.stdout)?) + } + /// Get the routes that have been learned and distributed by this specific fabric on this node. /// /// Read and parse the fabric config to get the protocol and the interfaces. Parse the vtysh @@ -841,6 +858,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 +896,11 @@ 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!("show ip route vrf {vrf} ospf json"), + None => "show ip route ospf json".to_string(), + }; + let ospf_routes_string = vtysh(&command)?; let ospf_routes: proxmox_frr::de::Routes = if ospf_routes_string.is_empty() { proxmox_frr::de::Routes::default() } else { @@ -895,21 +912,17 @@ pub mod pve_rs_sdn_fabrics { } FabricEntry::WireGuard(_) => Ok(Vec::new()), FabricEntry::Bgp(_) => { - 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'"]) - .output()? - .stdout, - )?; + let ipv4_command = match &vrf { + Some(vrf) => format!("show ip route vrf {vrf} bgp json"), + None => "show ip route bgp json".to_string(), + }; + let ipv6_command = match &vrf { + Some(vrf) => format!("show ipv6 route vrf {vrf} bgp json"), + None => "show ipv6 route bgp json".to_string(), + }; + let bgp_ipv4_routes_string = vtysh(&ipv4_command)?; - 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'"]) - .output()? - .stdout, - )?; + let bgp_ipv6_routes_string = vtysh(&ipv6_command)?; let mut bgp_routes: proxmox_frr::de::Routes = if bgp_ipv4_routes_string.is_empty() { proxmox_frr::de::Routes::default() @@ -941,6 +954,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 +975,11 @@ 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!("show ip ospf vrf {vrf} neighbor json"), + None => "show ip ospf neighbor json".to_string(), + }; + let ospf_neighbors_string = vtysh(&command)?; let ospf_neighbors: proxmox_frr::de::ospf::Neighbors = if ospf_neighbors_string.is_empty() { proxmox_frr::de::ospf::Neighbors::default() @@ -985,13 +998,11 @@ pub mod pve_rs_sdn_fabrics { } FabricEntry::WireGuard(_) => Ok(status::NeighborStatus::WireGuard(Vec::new())), FabricEntry::Bgp(_) => { - let bgp_neighbors_string = String::from_utf8( - Command::new("sh") - .env("VTYSH_HISTFILE", "/dev/null") - .args(["-c", "vtysh -c 'show bgp neighbors json'"]) - .output()? - .stdout, - )?; + let command = match &vrf { + Some(vrf) => format!("show bgp vrf {vrf} neighbors json"), + None => "show bgp neighbors json".to_string(), + }; + let bgp_neighbors_string = vtysh(&command)?; let bgp_neighbors: std::collections::BTreeMap = if bgp_neighbors_string.is_empty() { std::collections::BTreeMap::new() @@ -1018,6 +1029,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 +1051,11 @@ 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!("show ip ospf vrf {vrf} interface json"), + None => "show ip ospf interface json".to_string(), + }; + let ospf_interfaces_string = vtysh(&command)?; let ospf_interfaces: proxmox_frr::de::ospf::Interfaces = if ospf_interfaces_string.is_empty() { proxmox_frr::de::ospf::Interfaces::default() @@ -1063,13 +1074,11 @@ pub mod pve_rs_sdn_fabrics { } FabricEntry::WireGuard(_) => Ok(status::InterfaceStatus::WireGuard(Vec::new())), FabricEntry::Bgp(_) => { - let bgp_neighbors_string = String::from_utf8( - Command::new("sh") - .env("VTYSH_HISTFILE", "/dev/null") - .args(["-c", "vtysh -c 'show bgp neighbors json'"]) - .output()? - .stdout, - )?; + let command = match &vrf { + Some(vrf) => format!("show bgp vrf {vrf} neighbors json"), + None => "show bgp neighbors json".to_string(), + }; + let bgp_neighbors_string = vtysh(&command)?; let bgp_neighbors: std::collections::BTreeMap = if bgp_neighbors_string.is_empty() { std::collections::BTreeMap::new() -- 2.47.3