From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 9 Apr 2020 08:27:24 +0000 (+0200)
Subject: zones: code cleanup fallback to classic bridge case
X-Git-Url: https://git.proxmox.com/?p=pve-network.git;a=commitdiff_plain;h=a1ef0eb9c46332451e012a958d66544d5a310c56

zones: code cleanup fallback to classic bridge case

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

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index e686d97..9c7f83d 100644
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -227,8 +227,7 @@ sub get_bridge_vlan {
 
     my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid);
 
-    #fallback if classic bridge
-    return ($vnetid, undef) if !$vnet;
+    return ($vnetid, undef) if !$vnet; # fallback for classic bridge
 
     my $plugin_config = get_plugin_config($vnet);
     my $plugin = PVE::Network::SDN::Zones::Plugin->lookup($plugin_config->{type});
@@ -239,11 +238,9 @@ sub tap_create {
     my ($iface, $bridge) = @_;
 
     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge);
-
-    #fallback if classic bridge
-    if(!$vnet) {
+    if (!$vnet) { # fallback for classic bridge
 	PVE::Network::tap_create($iface, $bridge);
-        return;
+	return;
     }
 
     my $plugin_config = get_plugin_config($vnet);
@@ -255,11 +252,9 @@ sub veth_create {
     my ($veth, $vethpeer, $bridge, $hwaddr) = @_;
 
     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge);
-
-    #fallback if classic bridge
-    if(!$vnet) {
+    if (!$vnet) { # fallback for classic bridge
 	PVE::Network::veth_create($veth, $vethpeer, $bridge, $hwaddr);
-        return;
+	return;
     }
 
     my $plugin_config = get_plugin_config($vnet);
@@ -271,9 +266,7 @@ sub tap_plug {
     my ($iface, $bridge, $tag, $firewall, $trunks, $rate) = @_;
 
     my $vnet = PVE::Network::SDN::Vnets::get_vnet($bridge);
-
-    #fallback if classic bridge
-    if(!$vnet) {
+    if (!$vnet) { # fallback for classic bridge
 	PVE::Network::tap_plug($iface, $bridge, $tag, $firewall, $trunks, $rate);
 	return;
     }