public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 pve-network 6/9] evpn: extract function that reads frr config.
Date: Tue,  2 Apr 2024 18:07:35 +0200	[thread overview]
Message-ID: <20240402160736.519660-9-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240402160736.519660-2-s.lendl@proxmox.com>

read_local_frr_config reads /etc/frr/frr.conf.local.
This allows mocking local fs access in tests.

Signed-off-by: Stefan Lendl <s.lendl@proxmox.com>
Reviewed-by: Max Carrara <m.carrara@proxmox.com>
Tested-by: Max Carrara <m.carrara@proxmox.com>
---
 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 c2fdf88..836a689 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -487,6 +487,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) = @_;
 
@@ -500,8 +506,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.44.0





  parent reply	other threads:[~2024-04-02 16:07 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-02 16:07 [pve-devel] [PATCH v2 pve-network 0/9] SDN: Testing VNets as a blackbox Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 1/9] sdn: extract function that reads datacenter config Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 2/9] dnsmasq: extract function to systemctl command Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 3/9] dnsmasq: extract function that generates the ethers file path Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 4/9] dnsmasq: extract function that updates dnsmasq lease via dbus Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 5/9] controllers: extract function that reads network intreaces config Stefan Lendl
2024-04-02 16:07 ` Stefan Lendl [this message]
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 7/9] api: extract function that creates the sdn directory Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 8/9] tests: test VNets functionality as a blackbox Stefan Lendl
2024-04-02 16:07 ` [pve-devel] [PATCH v2 pve-network 9/9] tests: remove old Vnets tests Stefan Lendl
2024-04-03 11:55 ` [pve-devel] [PATCH v2 pve-network 0/9] SDN: Testing VNets as a blackbox Max Carrara
2024-04-05 13:19 ` Stefan Lendl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240402160736.519660-9-s.lendl@proxmox.com \
    --to=s.lendl@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal