From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Wed, 19 Jul 2023 09:42:44 +0000 (+0200)
Subject: zones: simplify status code
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=52ba64db27be8f6da9e394055ac52560b4034047;p=matthieu%2Fpve-network.git

zones: simplify status code

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm
index 36d6906..f6634b6 100644
--- a/src/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
@@ -212,9 +212,7 @@ sub generate_status_message {
 sub status {
     my ($class, $plugin_config, $zone, $vnetid, $vnet, $status) = @_;
 
-    my $err_msg = $class->generate_status_message($vnetid, $status);
-    return $err_msg;
-
+    return $class->generate_status_message($vnetid, $status);
 }
 
 
diff --git a/src/PVE/Network/SDN/Zones/QinQPlugin.pm b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
index 7160434..4c4be64 100644
--- a/src/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -170,11 +170,9 @@ sub status {
     my ($class, $plugin_config, $zone, $vnetid, $vnet, $status) = @_;
 
     my $bridge = $plugin_config->{bridge};
-    my $err_msg = [];
 
     if (!-d "/sys/class/net/$bridge") {
-        push @$err_msg, "missing $bridge";
-        return $err_msg;
+	return ["missing $bridge"];
     }
 
     my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
@@ -198,8 +196,7 @@ sub status {
 	push @$ifaces, $svlan_iface;
     }
 
-    $err_msg = $class->generate_status_message($vnetid, $status, $ifaces);
-    return $err_msg;
+    return $class->generate_status_message($vnetid, $status, $ifaces);
 }
 
 sub vnet_update_hook {
diff --git a/src/PVE/Network/SDN/Zones/VlanPlugin.pm b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
index f39b71d..6a68e8d 100644
--- a/src/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -141,10 +141,8 @@ sub status {
 
     my $bridge = $plugin_config->{bridge};
 
-    my $err_msg = [];
     if (!-d "/sys/class/net/$bridge") {
-        push @$err_msg, "missing $bridge";
-	return $err_msg;
+	return ["missing $bridge"];
     }
 
     my $vlan_aware = PVE::Network::SDN::Zones::Plugin::is_vlanaware($bridge);
@@ -165,8 +163,7 @@ sub status {
 	push @$ifaces, $vnet_uplinkpeer;
     }
 
-    $err_msg = $class->generate_status_message($vnetid, $status, $ifaces);
-    return $err_msg;
+    return $class->generate_status_message($vnetid, $status, $ifaces);
 }
 
 sub vnet_update_hook {