With the changes to how we handle the frr config generation,
controllers are now no longer responsible for serializing and writing
the FRR configuration. Instead, we pass the existing frr_config perl
hash to every controller, where controllers append their respective
configuration.
This requires a few changes in the controller API, so that they now
append to a perl hash, instead of directly writing their own
configuration to the file, which is now handled externally by the SDN
module.
We also remove the respective methods in the EvpnPlugin that were
previously responsible for serializing and writing the FRR
configuration, since they have been moved to the Frr helper module
instead.
Co-authored-by: Gabriel Goller <g.gol...@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanre...@proxmox.com>
---
src/PVE/Network/SDN/Controllers.pm | 67 +++----------------
src/PVE/Network/SDN/Controllers/BgpPlugin.pm | 21 +-----
src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 6 +-
src/PVE/Network/SDN/Controllers/IsisPlugin.pm | 21 +-----
src/PVE/Network/SDN/Controllers/Plugin.pm | 31 +--------
5 files changed, 19 insertions(+), 127 deletions(-)
diff --git a/src/PVE/Network/SDN/Controllers.pm
b/src/PVE/Network/SDN/Controllers.pm
index 9e8f3aa..788bfcc 100644
--- a/src/PVE/Network/SDN/Controllers.pm
+++ b/src/PVE/Network/SDN/Controllers.pm
@@ -79,12 +79,12 @@ sub read_etc_network_interfaces {
return $interfaces_config;
}
-sub generate_controller_config {
+sub generate_frr_config {
+ my ($frr_config, $sdn_config) = @_;
- my $cfg = PVE::Network::SDN::running_config();
- my $vnet_cfg = $cfg->{vnets};
- my $zone_cfg = $cfg->{zones};
- my $controller_cfg = $cfg->{controllers};
+ my $vnet_cfg = $sdn_config->{vnets};
+ my $zone_cfg = $sdn_config->{zones};
+ my $controller_cfg = $sdn_config->{controllers};
return if !$vnet_cfg && !$zone_cfg && !$controller_cfg;
@@ -101,13 +101,10 @@ sub generate_controller_config {
}
}
- # generate configuration
- my $config = {};
-
foreach my $id (sort keys %{$controller_cfg->{ids}}) {
my $plugin_config = $controller_cfg->{ids}->{$id};
my $plugin =
PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $plugin->generate_controller_config($plugin_config, $controller_cfg,
$id, $uplinks, $config);
+ $plugin->generate_frr_config($plugin_config, $controller_cfg, $id,
$uplinks, $frr_config);
}
foreach my $id (sort keys %{$zone_cfg->{ids}}) {
@@ -117,7 +114,7 @@ sub generate_controller_config {
my $controller = $controller_cfg->{ids}->{$controllerid};
if ($controller) {
my $controller_plugin =
PVE::Network::SDN::Controllers::Plugin->lookup($controller->{type});
- $controller_plugin->generate_controller_zone_config($plugin_config,
$controller, $controller_cfg, $id, $uplinks, $config);
+ $controller_plugin->generate_zone_frr_config($plugin_config,
$controller, $controller_cfg, $id, $uplinks, $frr_config);
}
}
@@ -132,57 +129,11 @@ sub generate_controller_config {
my $controller = $controller_cfg->{ids}->{$controllerid};
if ($controller) {
my $controller_plugin =
PVE::Network::SDN::Controllers::Plugin->lookup($controller->{type});
- $controller_plugin->generate_controller_vnet_config($plugin_config,
$controller, $zone, $zoneid, $id, $config);
+ $controller_plugin->generate_vnet_frr_config($plugin_config,
$controller, $zone, $zoneid, $id, $frr_config);
}
}
- return $config;
-}
-
-
-sub reload_controller {
-
- my $cfg = PVE::Network::SDN::running_config();
- my $controller_cfg = $cfg->{controllers};
-
- return if !$controller_cfg;
-
- foreach my $id (keys %{$controller_cfg->{ids}}) {
- my $plugin_config = $controller_cfg->{ids}->{$id};
- my $plugin =
PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $plugin->reload_controller();
- }
-}
-
-sub generate_controller_rawconfig {
- my ($config) = @_;
-
- my $cfg = PVE::Network::SDN::running_config();
- my $controller_cfg = $cfg->{controllers};
- return if !$controller_cfg;
-
- my $rawconfig = "";
- foreach my $id (keys %{$controller_cfg->{ids}}) {
- my $plugin_config = $controller_cfg->{ids}->{$id};
- my $plugin =
PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $rawconfig .= $plugin->generate_controller_rawconfig($plugin_config,
$config);
- }
- return $rawconfig;
-}
-
-sub write_controller_config {
- my ($config) = @_;
-
- my $cfg = PVE::Network::SDN::running_config();
- my $controller_cfg = $cfg->{controllers};
- return if !$controller_cfg;
-
- foreach my $id (keys %{$controller_cfg->{ids}}) {
- my $plugin_config = $controller_cfg->{ids}->{$id};
- my $plugin =
PVE::Network::SDN::Controllers::Plugin->lookup($plugin_config->{type});
- $plugin->write_controller_config($plugin_config, $config);
- }
+ return $frr_config;
}
1;
-
diff --git a/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
index 53963e5..3b21cad 100644
--- a/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm
@@ -53,7 +53,7 @@ sub options {
}
# Plugin implementation
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller, $id, $uplinks, $config) = @_;
my @peers;
@@ -132,7 +132,7 @@ sub generate_controller_config {
return $config;
}
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks,
$config) = @_;
}
@@ -164,21 +164,4 @@ sub on_update_hook {
}
}
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
- return "";
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
- return;
-}
-
-sub reload_controller {
- my ($class) = @_;
- return;
-}
-
1;
-
-
diff --git a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
index f9241a0..bde331f 100644
--- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm
@@ -41,7 +41,7 @@ sub options {
}
# Plugin implementation
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller_cfg, $id, $uplinks, $config) = @_;
my @peers;
@@ -119,7 +119,7 @@ sub generate_controller_config {
return $config;
}
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks,
$config) = @_;
my $local_node = PVE::INotify::nodename();
@@ -279,7 +279,7 @@ sub generate_controller_zone_config {
return $config;
}
-sub generate_controller_vnet_config {
+sub generate_vnet_frr_config {
my ($class, $plugin_config, $controller, $zone, $zoneid, $vnetid, $config)
= @_;
my $exitnodes = $zone->{'exitnodes'};
diff --git a/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
b/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
index 97c6876..ace19aa 100644
--- a/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
+++ b/src/PVE/Network/SDN/Controllers/IsisPlugin.pm
@@ -55,7 +55,7 @@ sub options {
}
# Plugin implementation
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller, $id, $uplinks, $config) = @_;
my $isis_ifaces = $plugin_config->{'isis-ifaces'};
@@ -87,7 +87,7 @@ sub generate_controller_config {
return $config;
}
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks,
$config) = @_;
}
@@ -113,21 +113,4 @@ sub on_update_hook {
}
}
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
- return "";
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
- return;
-}
-
-sub reload_controller {
- my ($class) = @_;
- return;
-}
-
1;
-
-
diff --git a/src/PVE/Network/SDN/Controllers/Plugin.pm
b/src/PVE/Network/SDN/Controllers/Plugin.pm
index d6ffc5f..26beff3 100644
--- a/src/PVE/Network/SDN/Controllers/Plugin.pm
+++ b/src/PVE/Network/SDN/Controllers/Plugin.pm
@@ -63,48 +63,23 @@ sub parse_section_header {
return undef;
}
-sub generate_sdn_config {
- my ($class, $plugin_config, $node, $data, $ctime) = @_;
-
- die "please implement inside plugin";
-}
-
-sub generate_controller_config {
+sub generate_frr_config {
my ($class, $plugin_config, $controller_cfg, $id, $uplinks, $config) = @_;
die "please implement inside plugin";
}
-
-sub generate_controller_zone_config {
+sub generate_zone_frr_config {
my ($class, $plugin_config, $controller, $controller_cfg, $id, $uplinks,
$config) = @_;
die "please implement inside plugin";
}
-sub generate_controller_vnet_config {
+sub generate_vnet_frr_config {
my ($class, $plugin_config, $controller, $zoneid, $vnetid, $config) = @_;
}
-sub generate_controller_rawconfig {
- my ($class, $plugin_config, $config) = @_;
-
- die "please implement inside plugin";
-}
-
-sub write_controller_config {
- my ($class, $plugin_config, $config) = @_;
-
- die "please implement inside plugin";
-}
-
-sub controller_reload {
- my ($class) = @_;
-
- die "please implement inside plugin";
-}
-
sub on_delete_hook {
my ($class, $controllerid, $zone_cfg) = @_;
--
2.39.5
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
