[pve-devel] [PATCH pve-network v2 1/3] fabrics: add fabrics status to SDN::status function

[Gabriel Goller <g.goller@proxmox.com>]

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 <g.goller@proxmox.com>
---
 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