From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 3 Jul 2020 11:46:39 +0000 (+0200)
Subject: white space and other minor cleanups
X-Git-Url: https://git.proxmox.com/?p=pve-network.git;a=commitdiff_plain;h=fc197ef2b6a7003577e4b2294fdb84573ac6a894

white space and other minor cleanups

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/PVE/API2/Network/SDN/Zones/Status.pm b/PVE/API2/Network/SDN/Zones/Status.pm
index abaa40d..17de68f 100644
--- a/PVE/API2/Network/SDN/Zones/Status.pm
+++ b/PVE/API2/Network/SDN/Zones/Status.pm
@@ -47,6 +47,7 @@ __PACKAGE__->register_method ({
 		status => {
 		    description => "Status of zone",
 		    type => 'string',
+		    enum => ['available', 'pending', 'error'],
 		},
 	    },
 	},
@@ -62,13 +63,13 @@ __PACKAGE__->register_method ({
 
 	my $res = [];
 
-        my ($zone_status, $vnet_status) = PVE::Network::SDN::status();
+	my ($zone_status, $vnet_status) = PVE::Network::SDN::status();
 
-        foreach my $id (keys %{$zone_status}) {
+	foreach my $id (sort keys %{$zone_status}) {
 	    my $item->{zone} = $id;
 	    $item->{status} = $zone_status->{$id}->{'status'};
-	    push @$res,$item;
-        }
+	    push @$res, $item;
+	}
 
 	return $res;
     }});
diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index 3e03f11..dd2a426 100644
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -213,12 +213,8 @@ sub status {
     my $vnet_status = {};
     my $zone_status = {};
 
-    foreach my $id (sort keys %{$zone_cfg->{ids}}) {
-	$zone_status->{$id}->{status} = 'available';
-	if($err_config) {
-	    $zone_status->{$id}->{status} = 'pending';
-	    next;
-	}
+    for my $id (sort keys %{$zone_cfg->{ids}}) {
+	$zone_status->{$id}->{status} = $err_config ? 'pending' : 'available';
     }
 
     foreach my $id (sort keys %{$vnet_cfg->{ids}}) {
@@ -232,7 +228,7 @@ sub status {
 	$vnet_status->{$id}->{zone} = $zone;
 	$vnet_status->{$id}->{status} = 'available';
 
-	if($err_config) {
+	if ($err_config) {
 	    $vnet_status->{$id}->{status} = 'pending';
 	    $vnet_status->{$id}->{statusmsg} = $err_config;
 	    next;
@@ -247,7 +243,7 @@ sub status {
 	}
     }
 
-    return($zone_status, $vnet_status);
+    return ($zone_status, $vnet_status);
 }
 
 sub tap_create {