[pve-devel] [PATCH pve-network 6/8] refactor(evpn): extract read_local_frr_config
Stefan Lendl
s.lendl at proxmox.com
Wed Jan 3 16:37:53 CET 2024
to allow mocking local fs access.
Signed-off-by: Stefan Lendl <s.lendl at 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
More information about the pve-devel
mailing list