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 A8F331FF17E for ; Thu, 30 Oct 2025 16:51:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 693FD27AD8; Thu, 30 Oct 2025 16:49:33 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 30 Oct 2025 16:48:27 +0100 Message-ID: <20251030154851.540408-21-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251030154851.540408-1-s.hanreich@proxmox.com> References: <20251030154851.540408-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.184 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 2/9] fabrics: add fabrics status to SDN::status function 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: Gabriel Goller This makes it so fabrics can be included in the SDN panel in the Web UI. To avoid having to calculate the fabrics status information on endpoints that only require the zone status, move the pre-existing call sites over to the zone-specific function. Co-authored-by: Stefan Hanreich Signed-off-by: Gabriel Goller Signed-off-by: Stefan Hanreich --- src/PVE/API2/Network/SDN/Nodes/Zones.pm | 2 +- src/PVE/Network/SDN.pm | 6 ++++-- src/test/debug/statuscheck.pl | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/PVE/API2/Network/SDN/Nodes/Zones.pm b/src/PVE/API2/Network/SDN/Nodes/Zones.pm index 54c444f..b92be6a 100644 --- a/src/PVE/API2/Network/SDN/Nodes/Zones.pm +++ b/src/PVE/API2/Network/SDN/Nodes/Zones.pm @@ -56,7 +56,7 @@ __PACKAGE__->register_method({ my $res = []; - my ($zone_status, $vnet_status) = PVE::Network::SDN::status(); + my ($zone_status, $vnet_status) = PVE::Network::SDN::Zones::status(); foreach my $id (sort keys %{$zone_status}) { my $item->{zone} = $id; diff --git a/src/PVE/Network/SDN.pm b/src/PVE/Network/SDN.pm index f2ecd4a..81374b0 100644 --- a/src/PVE/Network/SDN.pm +++ b/src/PVE/Network/SDN.pm @@ -16,6 +16,8 @@ use PVE::RESTEnvironment qw(log_warn); use PVE::RPCEnvironment; use PVE::Tools qw(file_get_contents file_set_contents extract_param dir_glob_regex run_command); +use PVE::RS::SDN::Fabrics; + use PVE::Network::SDN::Vnets; use PVE::Network::SDN::Zones; use PVE::Network::SDN::Controllers; @@ -97,9 +99,9 @@ sub ifquery_check { } sub status { - my ($zone_status, $vnet_status) = PVE::Network::SDN::Zones::status(); - return ($zone_status, $vnet_status); + my $fabric_status = PVE::RS::SDN::Fabrics::status(); + return ($zone_status, $vnet_status, $fabric_status); } sub running_config { diff --git a/src/test/debug/statuscheck.pl b/src/test/debug/statuscheck.pl index e43003b..e963117 100644 --- a/src/test/debug/statuscheck.pl +++ b/src/test/debug/statuscheck.pl @@ -3,7 +3,8 @@ use warnings; use PVE::Network::SDN; use Data::Dumper; -my ($transport_status, $vnet_status) = PVE::Network::SDN::status(); +my ($transport_status, $vnet_status, $fabric_status) = PVE::Network::SDN::status(); +print Dumper($fabric_status); print Dumper($vnet_status); print Dumper($transport_status); -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel