From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2664CBDE0 for ; Wed, 13 Sep 2023 13:39:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 05C7A1D2F2 for ; Wed, 13 Sep 2023 13:38:54 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 13 Sep 2023 13:38:53 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 874268172; Wed, 13 Sep 2023 13:38:46 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 8038219A7A1; Wed, 13 Sep 2023 13:38:46 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Wed, 13 Sep 2023 13:38:43 +0200 Message-Id: <20230913113845.1066417-5-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230913113845.1066417-1-aderumier@odiso.com> References: <20230913113845.1066417-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 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 HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [evpnplugin.pm] Subject: [pve-devel] [PATCH pve-network 2/3] controllers: frr: add parsing of "interfaces" section 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: , X-List-Received-Date: Wed, 13 Sep 2023 11:39:24 -0000 --- src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm index fd4b801..f1dd20f 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -384,6 +384,20 @@ sub generate_frr_ip_protocol { foreach my $rule (sort @$ips) { push @{$final_config}, $rule; } + +} + +sub generate_frr_interfaces { + my ($final_config, $interfaces) = @_; + + foreach my $k (sort keys %$interfaces) { + my $iface = $interfaces->{$k}; + push @{$final_config}, "!"; + push @{$final_config}, "interface $k"; + foreach my $rule (sort @$iface) { + push @{$final_config}, " $rule"; + } + } } sub generate_frr_routemap { @@ -445,6 +459,7 @@ sub generate_controller_rawconfig { } generate_frr_vrf($final_config, $config->{frr}->{vrf}); + generate_frr_interfaces($final_config, $config->{frr_interfaces}); generate_frr_recurse($final_config, $config->{frr}, undef, 0); generate_frr_list($final_config, $config->{frr_access_list}, "access-list"); generate_frr_list($final_config, $config->{frr_prefix_list}, "ip prefix-list"); @@ -481,6 +496,9 @@ sub parse_merge_frr_local_config { } elsif ($line =~ m/^vrf (.+)$/) { $section = \$config->{'frr'}->{'vrf'}->{$1}; next; + } elsif ($line =~ m/^interface (.+)$/) { + $section = \$config->{'frr_interfaces'}->{$1}; + next; } elsif ($line =~ m/address-family (.+)$/) { $section = \$config->{'frr'}->{'router'}->{$router}->{'address-family'}->{$1}; next; -- 2.39.2