[pve-devel] [PATCH pve-network 2/9] fabrics: add fabrics status to SDN::status function

[Stefan Hanreich]

From: Gabriel Goller <g.goller at proxmox.com>

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 <s.hanreich at proxmox.com>
Signed-off-by: Gabriel Goller <g.goller at proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich at proxmox.com>
---
 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