[pve-devel] [PATCH pve-network 07/11] merge the frr config with the fabrics frr config on apply

[Gabriel Goller]

Get the config directly from the file and convert it to the
Perl-Representation (the Frr-Representation), then generate the config
with the existing functions.

Signed-off-by: Gabriel Goller <g.gol...@proxmox.com>
---
 src/PVE/Network/SDN/Controllers.pm            |  1 -
 src/PVE/Network/SDN/Controllers/EvpnPlugin.pm |  3 ---
 src/PVE/Network/SDN/Controllers/Frr.pm        | 13 +++++++++++++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/PVE/Network/SDN/Controllers.pm 
b/src/PVE/Network/SDN/Controllers.pm
index 43f154b7338e..da3c957fe44d 100644
--- a/src/PVE/Network/SDN/Controllers.pm
+++ b/src/PVE/Network/SDN/Controllers.pm
@@ -143,7 +143,6 @@ sub generate_controller_config {
 
 
 sub reload_controller {
-
     my $cfg = PVE::Network::SDN::running_config();
     my $controller_cfg = $cfg->{controllers};
 
diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm 
b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index 6f875cb5dbf9..4b7120091b4b 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -359,14 +359,11 @@ sub find_isis_controller {
 
 sub generate_controller_rawconfig {
     my ($class, $plugin_config, $config) = @_;
-    #return 
PVE::Network::SDN::Controllers::Frr::generate_controller_rawconfig($class, 
$plugin_config, $config);
     die "implemented in the Frr helper";
 }
 
 sub write_controller_config {
     my ($class, $plugin_config, $config) = @_;
-    
-    #return 
PVE::Network::SDN::Controllers::Frr::write_controller_config($class, 
$plugin_config, $config);
     die "implemented in the Frr helper";
 }
 
diff --git a/src/PVE/Network/SDN/Controllers/Frr.pm 
b/src/PVE/Network/SDN/Controllers/Frr.pm
index 386dcae543e8..e9546f4d5e82 100644
--- a/src/PVE/Network/SDN/Controllers/Frr.pm
+++ b/src/PVE/Network/SDN/Controllers/Frr.pm
@@ -67,6 +67,19 @@ sub generate_controller_rawconfig {
     generate_frr_routemap($final_config, $config->{frr_routemap});
     generate_frr_simple_list($final_config, $config->{frr_ip_protocol});
 
+    # fabric config
+    # openfabric
+    my $openfabric_config = 
PVE::Network::SDN::Fabrics::get_config("openfabric");
+    my $openfabric_frr = $openfabric_config->get_perl_frr_repr($nodename);
+    generate_frr_interfaces($final_config, $openfabric_frr->{frr_interface});
+    generate_frr_recurse($final_config, $openfabric_frr->{frr}, undef, 0);
+
+    # ospf
+    my $ospf_config = PVE::Network::SDN::Fabrics::get_config("ospf");
+    my $ospf_frr = $ospf_config->get_perl_frr_repr($nodename);
+    generate_frr_interfaces($final_config, $ospf_frr->{frr_interface});
+    generate_frr_recurse($final_config, $ospf_frr->{frr}, undef, 0);
+
     push @{$final_config}, "!";
     push @{$final_config}, "line vty";
     push @{$final_config}, "!";
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel