From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 5C6A71FF183 for ; Wed, 16 Jul 2025 15:18:18 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F96111D2D; Wed, 16 Jul 2025 15:18:57 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Wed, 16 Jul 2025 15:08:01 +0200 Message-Id: <20250716130837.585796-41-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250716130837.585796-1-g.goller@proxmox.com> References: <20250716130837.585796-1-g.goller@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_MSPIKE_H2 0.001 Average reputation (+2) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH pve-network v5 06/21] controllers: define new api for frr config generation X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" From: Stefan Hanreich 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 Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN/Controllers.pm | 71 +++---------------- src/PVE/Network/SDN/Controllers/BgpPlugin.pm | 20 +----- src/PVE/Network/SDN/Controllers/EvpnPlugin.pm | 6 +- src/PVE/Network/SDN/Controllers/IsisPlugin.pm | 20 +----- src/PVE/Network/SDN/Controllers/Plugin.pm | 30 +------- 5 files changed, 20 insertions(+), 127 deletions(-) diff --git a/src/PVE/Network/SDN/Controllers.pm b/src/PVE/Network/SDN/Controllers.pm index 2ffd75e95533..3c1855253c5d 100644 --- a/src/PVE/Network/SDN/Controllers.pm +++ b/src/PVE/Network/SDN/Controllers.pm @@ -80,12 +80,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; @@ -103,14 +103,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} }) { @@ -121,8 +117,8 @@ sub generate_controller_config { 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, ); } } @@ -140,58 +136,11 @@ sub generate_controller_config { 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); - } } 1; - diff --git a/src/PVE/Network/SDN/Controllers/BgpPlugin.pm b/src/PVE/Network/SDN/Controllers/BgpPlugin.pm index dd835e49783f..5f3fcb029ae9 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; @@ -135,7 +135,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) = @_; } @@ -167,20 +167,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 4e71306499d2..63d209dc68f5 100644 --- a/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/EvpnPlugin.pm @@ -42,7 +42,7 @@ sub options { } # Plugin implementation -sub generate_controller_config { +sub generate_frr_config { my ($class, $plugin_config, $controller_cfg, $id, $uplinks, $config) = @_; my @peers; @@ -121,7 +121,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(); @@ -346,7 +346,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 6e3574de36cb..08952fb35126 100644 --- a/src/PVE/Network/SDN/Controllers/IsisPlugin.pm +++ b/src/PVE/Network/SDN/Controllers/IsisPlugin.pm @@ -58,7 +58,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'}; @@ -88,7 +88,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) = @_; } @@ -114,20 +114,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 3de1af72d2ac..d70e518b58b4 100644 --- a/src/PVE/Network/SDN/Controllers/Plugin.pm +++ b/src/PVE/Network/SDN/Controllers/Plugin.pm @@ -72,47 +72,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