From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH pve-network 2/2] zones: status: display specific message if vnet is not generated.
Date: Fri, 23 Jun 2023 14:49:41 +0200 [thread overview]
Message-ID: <20230623124941.895654-3-aderumier@odiso.com> (raw)
In-Reply-To: <20230623124941.895654-1-aderumier@odiso.com>
also cleanup duplicate code in plugins
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
src/PVE/Network/SDN/Zones/Plugin.pm | 18 +++++++++++++-----
src/PVE/Network/SDN/Zones/QinQPlugin.pm | 8 +-------
src/PVE/Network/SDN/Zones/SimplePlugin.pm | 17 -----------------
src/PVE/Network/SDN/Zones/VlanPlugin.pm | 8 +-------
4 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/src/PVE/Network/SDN/Zones/Plugin.pm b/src/PVE/Network/SDN/Zones/Plugin.pm
index 2c707b3..c2f496f 100644
--- a/src/PVE/Network/SDN/Zones/Plugin.pm
+++ b/src/PVE/Network/SDN/Zones/Plugin.pm
@@ -190,14 +190,13 @@ 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}) {
push @$err_msg, "missing $iface";
@@ -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 8b9de43..7160434 100644
--- 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 7757747..4922903 100644
--- 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 0bb6b8a..f39b71d 100644
--- 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;
}
--
2.39.2
next prev parent reply other threads:[~2023-06-23 12:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-23 12:49 [pve-devel] [PATCH pve-network 0/2] add warning if sdn config in not include in /etc/network/interfaces Alexandre Derumier
2023-06-23 12:49 ` [pve-devel] [PATCH pve-network 1/2] sdn: config generation : check if interfaces.d/sdn is sourced Alexandre Derumier
2023-06-23 12:49 ` Alexandre Derumier [this message]
2023-07-19 9:52 ` [pve-devel] applied-series: [PATCH pve-network 0/2] add warning if sdn config in not include in /etc/network/interfaces Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230623124941.895654-3-aderumier@odiso.com \
--to=aderumier@odiso.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox