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 3142B1FF13B for ; Wed, 25 Mar 2026 10:41:53 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id ACC37E41C; Wed, 25 Mar 2026 10:42:04 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-ve-rs 9/9] ve-config: fabrics: adapt frr config generation to new format Date: Wed, 25 Mar 2026 10:41:22 +0100 Message-ID: <20260325094142.174364-12-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260325094142.174364-1-s.hanreich@proxmox.com> References: <20260325094142.174364-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774431663893 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.721 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 Message-ID-Hash: LH37AQAACXNGW477DJYKYW64TJC6Z6SG X-Message-ID-Hash: LH37AQAACXNGW477DJYKYW64TJC6Z6SG X-MailFrom: s.hanreich@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: The format for representing match statements in route maps has changed, adapt the FRR config generation for fabrics to use the new format. Signed-off-by: Stefan Hanreich --- proxmox-ve-config/src/sdn/fabric/frr.rs | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/proxmox-ve-config/src/sdn/fabric/frr.rs b/proxmox-ve-config/src/sdn/fabric/frr.rs index f2b7c72..dbb5924 100644 --- a/proxmox-ve-config/src/sdn/fabric/frr.rs +++ b/proxmox-ve-config/src/sdn/fabric/frr.rs @@ -5,8 +5,7 @@ use tracing; use proxmox_frr::ser::openfabric::{OpenfabricInterface, OpenfabricRouter, OpenfabricRouterName}; use proxmox_frr::ser::ospf::{self, OspfInterface, OspfRouter}; use proxmox_frr::ser::route_map::{ - AccessAction, AccessListName, AccessListOrPrefixList, RouteMapEntry, RouteMapMatch, - RouteMapMatchInner, RouteMapName, RouteMapSet, + AccessAction, AccessListName, RouteMapEntry, RouteMapMatch, RouteMapName, RouteMapSet, }; use proxmox_frr::ser::{ self, FrrConfig, FrrProtocol, FrrWord, Interface, InterfaceName, IpProtocolRouteMap, @@ -402,16 +401,12 @@ fn build_openfabric_routemap( seq, action: ser::route_map::AccessAction::Permit, matches: vec![match router_ip { - IpAddr::V4(_) => RouteMapMatch::V4(RouteMapMatchInner::Address( - AccessListOrPrefixList::AccessList(AccessListName::new(format!( - "pve_openfabric_{fabric_id}_ips" - ))), - )), - IpAddr::V6(_) => RouteMapMatch::V6(RouteMapMatchInner::Address( - AccessListOrPrefixList::AccessList(AccessListName::new(format!( - "pve_openfabric_{fabric_id}_ip6s" - ))), - )), + IpAddr::V4(_) => RouteMapMatch::IpAddressAccessList(AccessListName::new(format!( + "pve_openfabric_{fabric_id}_ips" + ))), + IpAddr::V6(_) => RouteMapMatch::Ip6AddressAccessList(AccessListName::new(format!( + "pve_openfabric_{fabric_id}_ip6s" + ))), }], sets: vec![RouteMapSet::Src(router_ip)], custom_frr_config: Vec::new(), @@ -430,10 +425,8 @@ fn build_ospf_dummy_routemap( let routemap = RouteMapEntry { seq, action: AccessAction::Permit, - matches: vec![RouteMapMatch::V4(RouteMapMatchInner::Address( - AccessListOrPrefixList::AccessList(AccessListName::new(format!( - "pve_ospf_{fabric_id}_ips" - ))), + matches: vec![RouteMapMatch::IpAddressAccessList(AccessListName::new( + format!("pve_ospf_{fabric_id}_ips"), ))], sets: vec![RouteMapSet::Src(IpAddr::from(router_ip))], custom_frr_config: Vec::new(), -- 2.47.3