zones: status: display specific message if vnet is not generated.

also cleanup duplicate code in plugins

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>

diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm
index 2c707b3094db4f16a445f5e0feb1eb4262db4315..89f53d9a5cf7243a8a356bc980fad60dc0c79117 100644 (file)
--- a/src/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
@@ -190,13 +190,12 @@ sub parse_tag_number_or_range {
     return (scalar(@elements) > 1);
 }
 
-sub status {
-    my ($class, $plugin_config, $zone, $vnetid, $vnet, $status) = @_;
+sub generate_status_message {
+    my ($class, $vnetid, $status, $ifaces) = @_;
 
     my $err_msg = [];
 
-    # ifaces to check
-    my $ifaces = [ $vnetid ];
+    return ["vnet is not generated. Please check you reload network task log."] if !$status->{$vnetid}->{status};
 
     foreach my $iface (@{$ifaces}) {
         if (!$status->{$iface}->{status}) {
@@ -205,7 +204,16 @@ sub status {
            push @$err_msg, "error $iface";
         }
     }
+
+    return $err_msg;
+}
+
+sub status {
+    my ($class, $plugin_config, $zone, $vnetid, $vnet, $status) = @_;
+
+    my $err_msg = $class->generate_status_message($vnetid, $status);
     return $err_msg;
+
 }
 
 

diff --git a/src/PVE/Network/SDN/Zones/QinQPlugin.pm b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
index 8b9de433d559c8f8473bf34db49341fe33ce073c..71604343f55dbbc907fd1427a457c42cd76bbb93 100644 (file)
--- a/src/PVE/Network/SDN/Zones/QinQPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/QinQPlugin.pm
@@ -198,13 +198,7 @@ sub status {
        push @$ifaces, $svlan_iface;
     }
 
-    foreach my $iface (@{$ifaces}) {
-       if (!$status->{$iface}->{status}) {
-           push @$err_msg, "missing $iface";
-        } elsif ($status->{$iface}->{status} ne 'pass') {
-           push @$err_msg, "error $iface";
-       }
-    }
+    $err_msg = $class->generate_status_message($vnetid, $status, $ifaces);
     return $err_msg;
 }
 

diff --git a/src/PVE/Network/SDN/Zones/SimplePlugin.pm b/src/PVE/Network/SDN/Zones/SimplePlugin.pm
index 7757747b7f55bb12aa2cecc62ef2c0d6cb66ee7d..4922903acd558d98bff6dc080841445d1068f601 100644 (file)
--- a/src/PVE/Network/SDN/Zones/SimplePlugin.pm
+++ b/src/PVE/Network/SDN/Zones/SimplePlugin.pm
@@ -123,23 +123,6 @@ sub generate_sdn_config {
     return $config;
 }
 
-sub status {
-    my ($class, $plugin_config, $zone, $vnetid, $vnet, $status) = @_;
-
-    # ifaces to check
-    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') {
-           push @$err_msg, "error iface $iface";
-       }
-    }
-    return $err_msg;
-}
-
-
 sub vnet_update_hook {
     my ($class, $vnet_cfg, $vnetid, $zone_cfg) = @_;
 

diff --git a/src/PVE/Network/SDN/Zones/VlanPlugin.pm b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
index 0bb6b8a50446e0cdce79464be215310f20dbf55f..f39b71ddc9b9493555539521e3f636f7a4ee4ed8 100644 (file)
--- a/src/PVE/Network/SDN/Zones/VlanPlugin.pm
+++ b/src/PVE/Network/SDN/Zones/VlanPlugin.pm
@@ -165,13 +165,7 @@ sub status {
        push @$ifaces, $vnet_uplinkpeer;
     }
 
-    foreach my $iface (@{$ifaces}) {
-       if (!$status->{$iface}->{status}) {
-           push @$err_msg, "missing $iface";
-        } elsif ($status->{$iface}->{status} ne 'pass') {
-           push @$err_msg, "error iface $iface";
-       }
-    }
+    $err_msg = $class->generate_status_message($vnetid, $status, $ifaces);
     return $err_msg;
 }