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 0303A1FF13F for ; Thu, 12 Mar 2026 10:20:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B1E6B996; Thu, 12 Mar 2026 10:20:41 +0100 (CET) Message-ID: <234387df-69aa-4b37-8a72-b13affd7404e@proxmox.com> Date: Thu, 12 Mar 2026 10:20:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH pve-network v5 4/9] sdn: write structured frr config that can be rendered using templates To: Gabriel Goller , pve-devel@lists.proxmox.com References: <20260310120705.150425-1-g.goller@proxmox.com> <20260310120705.150425-14-g.goller@proxmox.com> Content-Language: en-US From: Hannes Laimer In-Reply-To: <20260310120705.150425-14-g.goller@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1773307170755 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.995 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 RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.408 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.819 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.903 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: 42B2GAT3OMMTIWSY7F46SEPSY7SWKAGH X-Message-ID-Hash: 42B2GAT3OMMTIWSY7F46SEPSY7SWKAGH 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: On 2026-03-10 13:09, Gabriel Goller wrote: > The structured frr config can be deserialized by rust and rendered using > the templates (isis and bgp) in proxmox-frr. > > Co-authored-by: Stefan Hanreich > Signed-off-by: Gabriel Goller > --- [..] > diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm > index cc217126607f..e3091c63ac8d 100644 > --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm > +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm > @@ -55,15 +55,15 @@ sub generate_frr_config { > my $local_node = PVE::INotify::nodename(); > > my @peers; > - my $asn = $plugin_config->{asn}; > + my $asn = int($plugin_config->{asn}); > my $ebgp = undef; > my $loopback = undef; > my $autortas = undef; > my $ifaceip = undef; > my $routerid = undef; > > - my $bgprouter = find_bgp_controller($local_node, $controller_cfg); > - my $isisrouter = find_isis_controller($local_node, $controller_cfg); > + my $bgp_controller = find_bgp_controller($local_node, $controller_cfg); > + my $isis_controller = find_isis_controller($local_node, $controller_cfg); > > if ($plugin_config->{'fabric'}) { > my $config = PVE::Network::SDN::Fabrics::config(1); > @@ -102,10 +102,10 @@ sub generate_frr_config { > } elsif ($plugin_config->{'peers'}) { > @peers = PVE::Tools::split_list($plugin_config->{'peers'}); > > - if ($bgprouter) { > - $loopback = $bgprouter->{loopback} if $bgprouter->{loopback}; > - } elsif ($isisrouter) { > - $loopback = $isisrouter->{loopback} if $isisrouter->{loopback}; > + if ($bgp_controller) { > + $loopback = $bgp_controller->{loopback} if $bgp_controller->{loopback}; > + } elsif ($isis_controller) { > + $loopback = $isis_controller->{loopback} if $isis_controller->{loopback}; > } > > ($ifaceip, my $interface) = > @@ -116,58 +116,60 @@ sub generate_frr_config { > return; > } > > - if ($bgprouter) { > - $ebgp = 1 if $plugin_config->{'asn'} ne $bgprouter->{asn}; > - $asn = $bgprouter->{asn} if $bgprouter->{asn}; > + if ($bgp_controller) { > + $ebgp = 1 if $plugin_config->{'asn'} ne $bgp_controller->{asn}; > + $asn = $bgp_controller->{asn} if $bgp_controller->{asn}; missing `int(..)`, so the var is flagged correctly > $autortas = $plugin_config->{'asn'} if $ebgp; > } > > return if !$asn || !$routerid; > - my $bgp = $config->{frr}->{router}->{"bgp $asn"} //= {}; > - > - my $remoteas = $ebgp ? "external" : $asn; > - > - #global options > - my @controller_config = ( > - "bgp router-id $routerid", > - "no bgp hard-administrative-reset", > - "no bgp default ipv4-unicast", > - "coalesce-time 1000", > - "no bgp graceful-restart notification", > - ); > - > - push(@{ $bgp->{""} }, @controller_config) if keys %{$bgp} == 0; > [..]