From: Stefan Hanreich <s.hanre...@proxmox.com>
Adds a new method to the SDN module that is responsible for generating
and writing the FRR configuration for all SDN plugins combined. It
utilizes the newly introduced FRR helper as well as the newly
introduced API for the controllers to generate an frr_config instead
of generating the configuration in the controller directly. It can
also reload the FRR daemon.
Change the tests to use this new API as well, so they use the new
methods for generating the frr configuration.
Signed-off-by: Stefan Hanreich <s.hanre...@proxmox.com>
Co-authored-by: Gabriel Goller <g.gol...@proxmox.com>
Signed-off-by: Gabriel Goller <g.gol...@proxmox.com>
---
src/PVE/Network/SDN.pm | 43 ++++++++++++++++++++++++++++++----
src/PVE/Network/SDN/Fabrics.pm | 15 ++++++++++++
src/test/run_test_zones.pl | 9 ++++---
3 files changed, 58 insertions(+), 9 deletions(-)
diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm
index c9c45b1c07ea..b777a098a987 100644
--- a/src/PVE/Network/SDN.pm
+++ b/src/PVE/Network/SDN.pm
@@ -20,6 +20,8 @@ use PVE::Network::SDN::Zones;
use PVE::Network::SDN::Controllers;
use PVE::Network::SDN::Subnets;
use PVE::Network::SDN::Dhcp;
+use PVE::Network::SDN::Frr;
+use PVE::Network::SDN::Fabrics;
my $running_cfg = "sdn/.running-config";
@@ -226,13 +228,46 @@ sub generate_zone_config {
PVE::Network::SDN::Zones::write_etc_network_config($raw_config);
}
-sub generate_controller_config {
+=head3 generate_frr_raw_config(\%running_config, \%fabric_config)
+
+Generates the raw frr config (as documented in the C<PVE::Network::SDN::Frr>
+module) for all SDN plugins combined.
+
+If provided, uses the passed C<\%running_config> und C<\%fabric_config> to
avoid
+re-parsing and re-reading both configurations. If not provided, this function
+will obtain them via the SDN and SDN::Fabrics modules and then generate the FRR
+configuration.
+
+=cut
+
+sub generate_frr_raw_config {
+ my ($running_config, $fabric_config) = @_;
+
+ $running_config = PVE::Network::SDN::running_config() if !$running_config;
+ $fabric_config = PVE::Network::SDN::Fabrics::config(1) if !$fabric_config;
+
+ my $frr_config = {};
+ PVE::Network::SDN::Controllers::generate_frr_config($frr_config,
$running_config);
+ PVE::Network::SDN::Frr::append_local_config($frr_config);
+
+ my $raw_config = PVE::Network::SDN::Frr::to_raw_config($frr_config);
+
+ my $fabrics_config =
PVE::Network::SDN::Fabrics::generate_frr_raw_config($fabric_config);
+ push @$raw_config, @$fabrics_config;
+
+ return $raw_config;
+}
+
+sub generate_frr_config {
my ($reload) = @_;
- my $raw_config =
PVE::Network::SDN::Controllers::generate_controller_config();
- PVE::Network::SDN::Controllers::write_controller_config($raw_config);
+ my $running_config = PVE::Network::SDN::running_config();
+ my $fabric_config = PVE::Network::SDN::Fabrics::config(1);
+
+ my $raw_config =
PVE::Network::SDN::generate_frr_raw_config($running_config, $fabric_config);
+ PVE::Network::SDN::Frr::write_raw_config($raw_config);
- PVE::Network::SDN::Controllers::reload_controller() if $reload;
+ PVE::Network::SDN::Frr::reload() if $reload;
}
sub generate_dhcp_config {
diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm
index 5f31fb503f48..6e3fa5234a5b 100644
--- a/src/PVE/Network/SDN/Fabrics.pm
+++ b/src/PVE/Network/SDN/Fabrics.pm
@@ -69,6 +69,21 @@ sub config_for_protocol {
return $module->config($section_config);
}
+sub generate_frr_raw_config {
+ my ($fabric_config) = @_;
+
+ my @raw_config = ();
+
+ my $nodename = PVE::INotify::nodename();
+
+ for my $protocol (sort keys %$fabric_config) {
+ my $protocol_config =
$fabric_config->{$protocol}->get_frr_raw_config($nodename);
+ push @raw_config, @$protocol_config if @$protocol_config;
+ }
+
+ return \@raw_config;
+}
+
sub write_config {
my ($config) = @_;
diff --git a/src/test/run_test_zones.pl b/src/test/run_test_zones.pl
index e506bea1a965..4137da6b2687 100755
--- a/src/test/run_test_zones.pl
+++ b/src/test/run_test_zones.pl
@@ -140,18 +140,17 @@ foreach my $test (@tests) {
if ($sdn_config->{controllers}) {
my $expected = read_file("./$test/expected_controller_config");
- my $controller_rawconfig = "";
+ my $config = "";
eval {
- my $config =
PVE::Network::SDN::Controllers::generate_controller_config();
- $controller_rawconfig =
-
PVE::Network::SDN::Controllers::generate_controller_rawconfig($config);
+ my $raw_config = PVE::Network::SDN::generate_frr_raw_config();
+ $config = PVE::Network::SDN::Frr::raw_config_to_string($raw_config);
};
if (my $err = $@) {
diag("got unexpected error - $err");
fail($name);
} else {
- is($controller_rawconfig, $expected, $name);
+ is($config, $expected, $name);
}
}
}
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
