From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v3 pve-network 2/5] evpn: extract read_local_frr_config
Date: Tue, 2 Apr 2024 13:07:39 +0200 [thread overview]
Message-ID: <20240402110740.291710-5-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240402110740.291710-3-s.lendl@proxmox.com>
to allow mocking local fs access
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
next prev parent reply other threads:[~2024-04-02 11:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 11:07 [pve-devel] [PATCH v3 pve-network 0/5] SDN: Add mocking to run tests in sbuild Stefan Lendl
2024-04-02 11:07 ` [pve-devel] [PATCH v3 pve-network 1/5] controllers: extract read_etc_network_interfaces Stefan Lendl
2024-04-02 11:07 ` Stefan Lendl [this message]
2024-04-02 11:07 ` [pve-devel] [PATCH v3 pve-network 3/5] tests: mocking more functions to avoid system access Stefan Lendl
2024-04-02 11:07 ` [pve-devel] [PATCH v3 pve-network 4/5] tests: run tests in sbuild Stefan Lendl
2024-04-02 11:07 ` [pve-devel] [PATCH v3 pve-network 5/5] gitignore: build artifacts from sbuild Stefan Lendl
2024-04-04 14:23 ` [pve-devel] [PATCH v3 pve-network 0/5] SDN: Add mocking to run tests in sbuild Stefan Hanreich
2024-04-04 14:51 ` [pve-devel] applied-series: " Thomas Lamprecht
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=20240402110740.291710-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.