From 96d7d81d6c627bd259ed851b76d6544f7b97a8de Mon Sep 17 00:00:00 2001 From: Stefan Lendl Date: Tue, 2 Apr 2024 13:07:39 +0200 Subject: [PATCH] evpn: extract read_local_frr_config to allow mocking local fs access Signed-off-by: Stefan Lendl Reviewed-by: Max Carrara Tested-by: Max Carrara Tested-By: Stefan Hanreich --- 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.39.5