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 9EA3C1FF15C for ; Fri, 22 Aug 2025 11:01:42 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A155ABD3A; Fri, 22 Aug 2025 11:01:15 +0200 (CEST) From: Gabriel Goller To: pve-devel@lists.proxmox.com Date: Fri, 22 Aug 2025 11:00:39 +0200 Message-ID: <20250822090102.102949-8-g.goller@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250822090102.102949-1-g.goller@proxmox.com> References: <20250822090102.102949-1-g.goller@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1755853267133 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.006 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 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 v2 1/3] 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" Add the fabrics to the global SDN::status function. This is needed in pve-manager to insert the status into the pvestatd resources. Signed-off-by: Gabriel Goller --- src/PVE/API2/Network/SDN/Zones/Content.pm | 2 +- src/PVE/API2/Network/SDN/Zones/Status.pm | 2 +- src/PVE/Network/SDN.pm | 6 ++++-- src/test/debug/statuscheck.pl | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/PVE/API2/Network/SDN/Zones/Content.pm b/src/PVE/API2/Network/SDN/Zones/Content.pm index 76663210067d..2427abe70c93 100644 --- a/src/PVE/API2/Network/SDN/Zones/Content.pm +++ b/src/PVE/API2/Network/SDN/Zones/Content.pm @@ -70,7 +70,7 @@ __PACKAGE__->register_method({ my $res = []; - my ($zone_status, $vnet_status) = PVE::Network::SDN::status(); + my ($zone_status, $vnet_status, $fabric_status) = PVE::Network::SDN::status(); foreach my $id (keys %{$vnet_status}) { if ($vnet_status->{$id}->{zone} eq $zoneid) { diff --git a/src/PVE/API2/Network/SDN/Zones/Status.pm b/src/PVE/API2/Network/SDN/Zones/Status.pm index 495756795f47..f9e79ffcef7a 100644 --- a/src/PVE/API2/Network/SDN/Zones/Status.pm +++ b/src/PVE/API2/Network/SDN/Zones/Status.pm @@ -63,7 +63,7 @@ __PACKAGE__->register_method({ my $res = []; - my ($zone_status, $vnet_status) = PVE::Network::SDN::status(); + my ($zone_status, $vnet_status, $fabric_status) = PVE::Network::SDN::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 83f2cc71845e..19efde8b6b95 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; @@ -87,9 +89,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 e43003ba8774..e963117659d8 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.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel