summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Grünbichler <f.gruenbichler@proxmox.com>2023-07-19 11:42:44 +0200
committerFabian Grünbichler <f.gruenbichler@proxmox.com>2023-07-19 11:46:53 +0200
commit52ba64db27be8f6da9e394055ac52560b4034047 (patch)
tree45096d2426ce81ee01653af302e217d11610812b
parentd227e3f4885715e4dd1ed03fa521b8bd76d8e8c7 (diff)
zones: simplify status code
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
-rw-r--r--src/PVE/Network/SDN/Zones/Plugin.pm4
-rw-r--r--src/PVE/Network/SDN/Zones/QinQPlugin.pm7
-rw-r--r--src/PVE/Network/SDN/Zones/VlanPlugin.pm7
3 files changed, 5 insertions, 13 deletions
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 {