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 44DAEB8899 for ; Tue, 5 Dec 2023 14:14:14 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 277F61B355 for ; Tue, 5 Dec 2023 14:13:44 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 5 Dec 2023 14:13:43 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4861544C7F for ; Tue, 5 Dec 2023 14:13:43 +0100 (CET) From: Stefan Lendl To: pve-devel@lists.proxmox.com Date: Tue, 5 Dec 2023 14:12:08 +0100 Message-ID: <20231205131209.1813439-4-s.lendl@proxmox.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231205131209.1813439-2-s.lendl@proxmox.com> References: <20231205131209.1813439-2-s.lendl@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 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 T_SCC_BODY_TEXT_LINE -0.01 - 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/4] refactor(evpn): extract read_local_frr_config 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: Tue, 05 Dec 2023 13:14:14 -0000 Allows mocking local fs access Signed-off-by: Stefan Lendl --- src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm index f320139..fc297f9 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -461,6 +461,12 @@ sub generate_frr_list { } } +sub read_local_frr_config { + if (-e "/etc/frr/frr.conf.local") { + return file_get_contents("/etc/frr/frr.conf.local"); + } +}; + sub generate_controller_rawconfig { my ($class, $plugin_config, $config) = @_; @@ -474,8 +480,8 @@ sub generate_controller_rawconfig { push @{$final_config}, "service integrated-vtysh-config"; push @{$final_config}, "!"; - if (-e "/etc/frr/frr.conf.local") { - my $local_conf = file_get_contents("/etc/frr/frr.conf.local"); + my $local_conf = read_local_frr_config(); + if ($local_conf) { parse_merge_frr_local_config($config, $local_conf); } -- 2.42.0