polugin simple: whitespace/cleanups

[pve-network.git] / PVE / Network / SDN / Zones / SimplePlugin.pm

diff --git a/PVE/Network/SDN/Zones/SimplePlugin.pm b/PVE/Network/SDN/Zones/SimplePlugin.pm
index 9fd3b29e5679ad281c2dd127cf90cad88f1efb15..6137062f22356a27c9b13d634178e94088eece61 100644 (file)
--- a/PVE/Network/SDN/Zones/SimplePlugin.pm
+++ b/PVE/Network/SDN/Zones/SimplePlugin.pm
@@ -12,9 +12,8 @@ sub type {
 }
 
 sub options {
-
     return {
-        nodes => { optional => 1},
+       nodes => { optional => 1},
        mtu => { optional => 1 }
     };
 }
@@ -23,13 +22,15 @@ sub options {
 sub generate_sdn_config {
     my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $controller, $interfaces_config, $config) = @_;
 
+    return $config if$config->{$vnetid}; # nothing to do
+
     my $ipv4 = $vnet->{ipv4};
     my $ipv6 = $vnet->{ipv6};
     my $mac = $vnet->{mac};
     my $alias = $vnet->{alias};
     my $mtu = $plugin_config->{mtu} if $plugin_config->{mtu};
 
-    #vnet bridge
+    # vnet bridge
     my @iface_config = ();
     push @iface_config, "address $ipv4" if $ipv4;
     push @iface_config, "address $ipv6" if $ipv6;
@@ -37,13 +38,14 @@ sub generate_sdn_config {
     push @iface_config, "bridge_ports none";
     push @iface_config, "bridge_stp off";
     push @iface_config, "bridge_fd 0";
-    if($vnet->{vlanaware}) {
+    if ($vnet->{vlanaware}) {
         push @iface_config, "bridge-vlan-aware yes";
         push @iface_config, "bridge-vids 2-4094";
     }
     push @iface_config, "mtu $mtu" if $mtu;
     push @iface_config, "alias $alias" if $alias;
-    push(@{$config->{$vnetid}}, @iface_config) if !$config->{$vnetid};
+
+    push @{$config->{$vnetid}}, @iface_config;
 
     return $config;
 }
@@ -51,15 +53,13 @@ sub generate_sdn_config {
 sub status {
     my ($class, $plugin_config, $zone, $vnetid, $vnet, $status) = @_;
 
-    my $err_msg = [];
-
     # ifaces to check
-    my $ifaces = [ $vnetid];
-
+    my $ifaces = [ $vnetid ];
+    my $err_msg = [];
     foreach my $iface (@{$ifaces}) {
        if (!$status->{$iface}->{status}) {
            push @$err_msg, "missing $iface";
-        } elsif ($status->{$iface}->{status} ne 'pass') {
+       } elsif ($status->{$iface}->{status} ne 'pass') {
            push @$err_msg, "error iface $iface";
        }
     }