From: Stefan Lendl <s.lendl@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 6/8] refactor(evpn): extract read_local_frr_config
Date: Wed, 3 Jan 2024 16:37:53 +0100 [thread overview]
Message-ID: <20240103153753.407079-9-s.lendl@proxmox.com> (raw)
In-Reply-To: <20240103153753.407079-3-s.lendl@proxmox.com>
to allow mocking local fs access.
Signed-off-by: Stefan Lendl <s.lendl@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 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
next prev parent reply other threads:[~2024-01-03 15:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-03 15:37 [pve-devel] [PATCH pve-network 0/8] SDN Vnet blackbox testing Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 1/8] refactor(sdn): extract cfs_read_file(datacenter.cfg) Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 2/8] refactor(dnsmasq): extract systemctl_service function Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 3/8] refactor(dnsmasq): extract ethers_file function Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 4/8] refactor(dnsmasq): extract update_lease function Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 5/8] refactor(controllers): extract read_etc_network_interfaces Stefan Lendl
2024-01-03 15:37 ` Stefan Lendl [this message]
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 7/8] refactor(api): extract create_etc_interfaces_sdn_dir Stefan Lendl
2024-01-03 15:37 ` [pve-devel] [PATCH pve-network 8/8] test(vnets): add test_vnets_blackbox Stefan Lendl
2024-03-18 12:41 ` Max Carrara
2024-03-18 14:14 ` Stefan Lendl
2024-03-18 15:00 ` Max Carrara
2024-03-18 12:41 ` [pve-devel] [PATCH pve-network 0/8] SDN Vnet blackbox testing Max Carrara
2024-04-02 16:10 ` 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=20240103153753.407079-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 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.