From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 691EA1FF15C for ; Fri, 5 Sep 2025 13:45:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 855C11339D; Fri, 5 Sep 2025 13:45:14 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 5 Sep 2025 13:45:00 +0200 Message-ID: <20250905114504.195110-6-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250905114504.195110-1-g.goller@proxmox.com> References: <20250905114504.195110-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1757072690569 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.004 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH proxmox-perl-rs 2/2] pve-rs: sdn: add functions to retrieve the Zone/Vnet routes X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" To show the routes of the Zones (L3VPN) and Vnets (L2VPN) query FRR with different commands and parse the output. To correctly filter the Vnet routes by Vnet we also need to read the sdn config to get the VNI. We can use the VNI to filter the FRR output. Signed-off-by: Gabriel Goller --- pve-rs/src/bindings/sdn/fabrics.rs | 57 +++++++++++++++++++ pve-rs/src/sdn/status.rs | 89 +++++++++++++++++++++++++++++- 2 files changed, 145 insertions(+), 1 deletion(-) diff --git a/pve-rs/src/bindings/sdn/fabrics.rs b/pve-rs/src/bindings/sdn/fabrics.rs index 079a58c27d32..88e25366ee40 100644 --- a/pve-rs/src/bindings/sdn/fabrics.rs +++ b/pve-rs/src/bindings/sdn/fabrics.rs @@ -23,6 +23,7 @@ pub mod pve_rs_sdn_fabrics { use proxmox_section_config::typed::SectionConfigData; use proxmox_ve_config::common::valid::Validatable; + use proxmox_ve_config::sdn::config::{RunningConfig, SdnConfig}; use proxmox_ve_config::sdn::fabric::section_config::Section; use proxmox_ve_config::sdn::fabric::section_config::fabric::{ Fabric as ConfigFabric, FabricId, @@ -739,4 +740,60 @@ pub mod pve_rs_sdn_fabrics { status::get_status(route_status) } + + /// Get all the L3 routes for the passed zone. + /// + /// Every zone has a vrf named `vrf_{zone}`. Show all the L3 (IP) routes on the VRF of the + /// zone. + #[export] + fn l3vpn_routes(zone: String) -> Result { + let command = format!("vtysh -c 'show ip route vrf vrf_{zone} json'"); + let l3vpn_routes_string = + String::from_utf8(Command::new("sh").args(["-c", &command]).output()?.stdout)?; + let l3vpn_routes: proxmox_frr::de::Routes = if l3vpn_routes_string.is_empty() { + proxmox_frr::de::Routes::default() + } else { + serde_json::from_str(&l3vpn_routes_string) + .with_context(|| "error parsing l3vpn routes")? + }; + + status::get_l3vpn_routes(&format!("vrf_{zone}"), l3vpn_routes) + } + + /// Get all the L2 routes for the passed vnet. + /// + /// When using VXLAN the vnet "stores" the L2 routes in it's FDB. The best way to retrieve them + /// with additional metadata is to query FRR. Use the `show bgp l2vpn evpn route` command. + /// To filter by vnet, get the VNI of the vnet from the config and use it in the command. + #[export] + fn l2vpn_routes(vnet: String) -> Result { + // read config to get the vni of the vnet + let raw_config = std::fs::read_to_string("/etc/pve/sdn/.running-config")?; + let running_config: RunningConfig = serde_json::from_str(&raw_config)?; + let parsed_config = SdnConfig::try_from(running_config)?; + + let Some(vni) = parsed_config.zones().find_map(|zone| { + zone.vnets().find_map(|vnet_config| { + if vnet_config.name().as_ref() == vnet { + *vnet_config.tag() + } else { + None + } + }) + }) else { + anyhow::bail!("vnet does not have a vni"); + }; + + let command = format!("vtysh -c 'show bgp l2vpn evpn route vni {vni} json'"); + let l2vpn_routes_string = + String::from_utf8(Command::new("sh").args(["-c", &command]).output()?.stdout)?; + let l2vpn_routes: proxmox_frr::de::evpn::Routes = if l2vpn_routes_string.is_empty() { + proxmox_frr::de::evpn::Routes::default() + } else { + serde_json::from_str(&l2vpn_routes_string) + .with_context(|| "error parsing l2vpn routes")? + }; + + status::get_l2vpn_routes(l2vpn_routes) + } } diff --git a/pve-rs/src/sdn/status.rs b/pve-rs/src/sdn/status.rs index 81253732472e..198ef7037683 100644 --- a/pve-rs/src/sdn/status.rs +++ b/pve-rs/src/sdn/status.rs @@ -1,6 +1,10 @@ -use std::collections::{BTreeMap, HashMap, HashSet}; +use std::{ + collections::{BTreeMap, HashMap, HashSet}, + net::IpAddr, +}; use anyhow::Context; +use proxmox_network_types::{ip_address::Cidr, mac_address::MacAddress}; use proxmox_section_config::typed::SectionConfigData; use serde::{Deserialize, Serialize}; @@ -346,3 +350,86 @@ pub fn get_status(routes: RoutesParsed) -> Result, any Ok(stats) } +/// Common for nexthops, they can be either a interface name or a ip addr +#[derive(Debug, Serialize)] +#[serde(untagged)] +pub enum IpAddrOrInterfaceName { + /// IpAddr + IpAddr(IpAddr), + /// Interface Name + InterfaceName(String), +} + +/// One L3VPN route +#[derive(Debug, Serialize)] +pub struct L3VPNRoute { + ip: Cidr, + next_hop: Vec, +} + +/// All L3VPN routes of a zone +#[derive(Debug, Serialize)] +pub struct L3VPNRoutes(Vec); + +/// Convert parsed routes from frr into l3vpn routes, this means we need to match against the vrf +/// name of the zone. +pub fn get_l3vpn_routes(vrf: &str, routes: de::Routes) -> Result { + let mut result = Vec::new(); + for (prefix, routes) in routes.0 { + for route in routes { + if route.vrf_name == vrf { + result.push(L3VPNRoute { + ip: prefix, + next_hop: route + .nexthops + .into_iter() + .filter_map(|nh| { + if let Some(ip) = nh.ip { + Some(IpAddrOrInterfaceName::IpAddr(ip)) + } else { + nh.interface_name.map(IpAddrOrInterfaceName::InterfaceName) + } + }) + .collect(), + }); + } + } + } + Ok(L3VPNRoutes(result)) +} + +/// One L2VPN route +#[derive(Debug, Serialize)] +pub struct L2VPNRoute { + mac: MacAddress, + ip: IpAddr, + ip_nexthop: IpAddr, +} + +/// All L2VPN routes of a specific vnet +#[derive(Debug, Serialize)] +pub struct L2VPNRoutes(Vec); + +/// Convert the parsed frr evpn struct into an array of structured L2VPN routes +pub fn get_l2vpn_routes(routes: de::evpn::Routes) -> Result { + let mut result = Vec::new(); + for route in routes.0.values().filter_map(|entry| match entry { + de::evpn::Entry::Route(r) => Some(r), + de::evpn::Entry::Metadata(_) => None, + }) { + route.paths.iter().flatten().for_each(|path| { + if path.bestpath { + if let (Some(mac), Some(ip), Some(nh)) = (path.mac, path.ip, path.nexthops.first()) + { + result.push(L2VPNRoute { + mac, + ip, + ip_nexthop: nh.ip, + }); + } + } + }); + } + + Ok(L2VPNRoutes(result)) +} -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel