]> git.puffer.fish Git - matthieu/pve-network.git/commitdiff
evpn: extract read_local_frr_config
authorStefan Lendl <s.lendl@proxmox.com>
Tue, 2 Apr 2024 11:07:39 +0000 (13:07 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 4 Apr 2024 14:50:08 +0000 (16:50 +0200)
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>
Tested-By: Stefan Hanreich <s.hanreich@proxmox.com>
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm

index c2fdf884f934d11dc21b7dc60ba47a310cd88983..836a689cb5ab61149912baa184b05b3f31dd0d4b 100644 (file)
@@ -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);
     }