Mirror/pve-network
1
0
Fork 1
mirror of git://git.proxmox.com/git/pve-network.git synced 2025-04-30 11:27:11 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

zones: simplify status code

Browse source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2023-07-19 11:42:44 +02:00
parent d227e3f488
commit 52ba64db27
3 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/PVE/Network/SDN/Zones/Plugin.pm
View file

@ -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);
}

7
src/PVE/Network/SDN/Zones/QinQPlugin.pm
View file

@ -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 {

7
src/PVE/Network/SDN/Zones/VlanPlugin.pm
View file

@ -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 {