From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2B8399108 for ; Fri, 23 Jun 2023 14:49:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12C9135013 for ; Fri, 23 Jun 2023 14:49:50 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 23 Jun 2023 14:49:49 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 40E107E61; Fri, 23 Jun 2023 14:49:43 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 36371348211; Fri, 23 Jun 2023 14:49:43 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 23 Jun 2023 14:49:41 +0200 Message-Id: <20230623124941.895654-3-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230623124941.895654-1-aderumier@odiso.com> References: <20230623124941.895654-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.035 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network 2/2] zones: status: display specific message if vnet is not generated. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jun 2023 12:49:50 -0000 also cleanup duplicate code in plugins Signed-off-by: Alexandre Derumier --- 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