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 abaa40d02c4a608d9340e3c1be470c46af405f99..17de68f54d4d41fc04809b6ee14fedd29f4eefca 100644 (file)
--- 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 3e03f1167f5151cb576c32481965ac1f4208dcfe..dd2a426b1c95b0facbc4da2a0345c111edaa272a 100644 (file)
--- 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 {