From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 205BA1FF165 for ; Thu, 22 May 2025 18:19:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 13B70A568; Thu, 22 May 2025 18:18:03 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 22 May 2025 18:16:59 +0200 Message-Id: <20250522161731.537011-44-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522161731.537011-1-s.hanreich@proxmox.com> References: <20250522161731.537011-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.225 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH pve-network v3 10/21] sdn: frr: add daemon status to frr helper 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" Add functions that allow reading and manipulating values in the /etc/frr/daemons file. We need this for en/disabling daemons depending on which fabric types are configured. We enable daemons dynamically, depending on the currently configured fabrics. If a daemon is enabled but all fabrics using it get deleted, we disable them as well. The helper works by iterating over the lines of the daemons file from FRR, parsing the key and checking if the key is managed by the SDN configuration, then sets it. As a safeguard, keys that can be changed by SDN have to be explicitly configured in the respective hash of the Frr module. Co-authored-by: Gabriel Goller Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN.pm | 18 +++++++++- src/PVE/Network/SDN/Fabrics.pm | 15 ++++++++ src/PVE/Network/SDN/Frr.pm | 64 ++++++++++++++++++++++++++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index 1ab2e4d..8c9ce8c 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -279,16 +279,32 @@ sub generate_frr_raw_config { return $raw_config; } +=head3 get_frr_daemon_status(\%fabric_config) + +Returns a hash that indicates which FRR daemons, that are managed by SDN, should +be enabled / disabled. + +=cut + +sub get_frr_daemon_status { + my ($fabric_config) = @_; + + return PVE::Network::SDN::Fabrics::get_frr_daemon_status($fabric_config); +} + sub generate_frr_config { my ($apply) = @_; my $running_config = PVE::Network::SDN::running_config(); my $fabric_config = PVE::Network::SDN::Fabrics::config(1); + my $daemon_status = PVE::Network::SDN::get_frr_daemon_status($fabric_config); + my $needs_restart = PVE::Network::SDN::Frr::set_daemon_status($daemon_status, 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::Frr::apply() if $apply; + PVE::Network::SDN::Frr::apply($needs_restart) if $apply; } sub generate_dhcp_config { diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm index 0a98f59..4950a88 100644 --- a/src/PVE/Network/SDN/Fabrics.pm +++ b/src/PVE/Network/SDN/Fabrics.pm @@ -46,6 +46,21 @@ sub write_config { cfs_write_file("sdn/fabrics.cfg", $config->to_raw(), 1); } +sub get_frr_daemon_status { + my ($fabric_config) = @_; + + my $daemon_status = {}; + my $nodename = PVE::INotify::nodename(); + + my $enabled_daemons = $fabric_config->enabled_daemons($nodename); + + for my $daemon (@$enabled_daemons) { + $daemon_status->{$daemon} = 1; + } + + return $daemon_status; +} + sub generate_frr_raw_config { my ($fabric_config) = @_; diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 871d800..4950bf5 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -109,6 +109,70 @@ sub restart { run_command(['systemctl', 'restart', 'frr'], errfunc => $err); } +my $SDN_DAEMONS_DEFAULT = { + ospfd => 0, + fabricd => 0, +}; + +=head3 set_daemon_status(\%daemons, $set_default) + +Sets the status of all daemons supplied in C<\%daemons>. This only works for +daemons managed by SDN, as indicated in the C<$SDN_DAEMONS_DEFAULT> constant. If +a daemon is supplied that isn't managed by SDN then this command will fail. If +C<$set_default> is set, then additionally all sdn-managed daemons that are +missing in C<\%daemons> are reset to their default value. It returns whether the +status of any daemons has changed, which indicates that a restart of the daemon +is required, rather than only a reload. + +=cut + +sub set_daemon_status { + my ($daemon_status, $set_default) = @_; + + my $daemons_file = "/etc/frr/daemons"; + die "daemons file does not exist" if !-e $daemons_file; + + for my $daemon (keys %$daemon_status) { + die "$daemon is not SDN managed" if !defined $SDN_DAEMONS_DEFAULT->{$daemon}; + } + + if ($set_default) { + for my $daemon (keys %$SDN_DAEMONS_DEFAULT) { + $daemon_status->{$daemon} = $SDN_DAEMONS_DEFAULT->{$daemon} + if !defined($daemon_status->{$daemon}); + } + } + + my $old_config = PVE::Tools::file_get_contents($daemons_file); + my $new_config = ""; + + my $changed = 0; + + my @lines = split(/\n/, $old_config); + + for my $line (@lines) { + if ($line =~ m/^([a-z_]+)=/) { + my $key = $1; + my $status = $daemon_status->{$key}; + + if (defined $status) { + my $value = $status ? "yes" : "no"; + my $new_line = "$key=$value"; + + $changed = 1 if $new_line ne $line; + + $line = $new_line; + } + } + + $new_config .= "$line\n"; + } + + PVE::Tools::file_set_contents($daemons_file, $new_config); + + return $changed; +} + =head3 to_raw_config(\%frr_config) Converts a given C<\%frr_config> to the raw config format. -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel