From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 912731FF14C for ; Fri, 15 May 2026 13:07:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5DC838F2B; Fri, 15 May 2026 13:07:28 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH pve-network v2 2/4] sdn: evpn: keep router-id valid on IPv6 underlay Date: Fri, 15 May 2026 13:06:46 +0200 Message-ID: <20260515110648.217493-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260515110648.217493-1-h.laimer@proxmox.com> References: <20260515110648.217493-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1778843207025 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.918 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 KAM_MAILER 2 Automated Mailer Tag Left in Email 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: CVGJCPFKDJKE3F7S4QINIZMK43HORS57 X-Message-ID-Hash: CVGJCPFKDJKE3F7S4QINIZMK43HORS57 X-MailFrom: h.laimer@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: BGP router-ids are 32-bit values, so use get_router_id() instead of the address directly, cause that would only work for IPv4 underlays. And remove dead code in the EVPN zone plugin, we don't need the router-id there anywhere. Signed-off-by: Hannes Laimer --- src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 4 ++-- src/PVE/Network/SDN/Zones/EvpnPlugin.pm | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm index 0246788..6568459 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -160,7 +160,7 @@ sub generate_frr_config { $loopback = "dummy_$fabric->{id}"; $ifaceip = $current_node->{$addr_key}; - $routerid = $current_node->{$addr_key}; + $routerid = PVE::Network::SDN::Controllers::Plugin::get_router_id($ifaceip, $loopback); if ($fabric->{protocol} eq 'bgp' && $bgp_mode eq 'external') { if (!$current_node->{asn}) { @@ -387,7 +387,7 @@ sub generate_zone_frr_config { $loopback = "dummy_$fabric->{id}"; $ifaceip = $current_node->{$addr_key}; - $routerid = $current_node->{$addr_key}; + $routerid = PVE::Network::SDN::Controllers::Plugin::get_router_id($ifaceip, $loopback); } elsif ($controller->{peers}) { @peers = PVE::Tools::split_list($controller->{'peers'}) if $controller->{'peers'}; diff --git a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm index a78b646..0be304a 100644 --- a/src/PVE/Network/SDN/Zones/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Zones/EvpnPlugin.pm @@ -157,7 +157,6 @@ sub generate_sdn_config { my $loopback = undef; my $ifaceip = undef; my $iface = undef; - my $routerid = undef; if ($controller->{peers}) { @peers = PVE::Tools::split_list($controller->{'peers'}); @@ -204,7 +203,6 @@ sub generate_sdn_config { $loopback = "dummy_$fabric->{id}"; $ifaceip = $current_node->{$addr_key}; - $routerid = $current_node->{$addr_key}; } else { die "neither fabric nor peers configured for EVPN controller $controller->{id}"; } -- 2.47.3