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 0676C66BAA for ; Tue, 28 Jul 2020 13:00:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E1E2723B1F for ; Tue, 28 Jul 2020 13:00:25 +0200 (CEST) Received: from mailpro.odiso.net (mailpro.odiso.net [89.248.211.110]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 65BB523A78 for ; Tue, 28 Jul 2020 13:00:19 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 64A6B111814A; Tue, 28 Jul 2020 13:00:11 +0200 (CEST) Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id iILOHHTRSvpF; Tue, 28 Jul 2020 13:00:11 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id E59B81118129; Tue, 28 Jul 2020 13:00:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at mailpro.odiso.com Received: from mailpro.odiso.net ([127.0.0.1]) by localhost (mailpro.odiso.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Mn8zvZIv6UWQ; Tue, 28 Jul 2020 13:00:06 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id 568ED1118152; Tue, 28 Jul 2020 13:00:05 +0200 (CEST) From: Alexandre Derumier To: pve-devel@pve.proxmox.com Date: Tue, 28 Jul 2020 12:59:52 +0200 Message-Id: <20200728105958.18313-7-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200728105958.18313-1-aderumier@odiso.com> References: <20200728105958.18313-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [subnetplugin.pm, vnetplugin.pm] Subject: [pve-devel] [PATCH v4 pve-network 06/12] vnets: subnets: use cidr 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: Tue, 28 Jul 2020 11:00:26 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/SubnetPlugin.pm | 3 ++- PVE/Network/SDN/VnetPlugin.pm | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/PVE/Network/SDN/SubnetPlugin.pm b/PVE/Network/SDN/SubnetPlug= in.pm index 1b790a6..c555314 100644 --- a/PVE/Network/SDN/SubnetPlugin.pm +++ b/PVE/Network/SDN/SubnetPlugin.pm @@ -120,7 +120,8 @@ sub on_delete_hook { my $vnet =3D $vnet_cfg->{ids}->{$id}; my @subnets =3D PVE::Tools::split_list($vnet->{subnets}) if $vnet->{sub= nets}; foreach my $subnet (@subnets) { - raise_param_exc({ subnet =3D> "$subnet is attached to vnet $id"}) i= f $subnet eq $subnetid; + my $id =3D $subnet =3D~ s/\//-/r; + raise_param_exc({ subnet =3D> "$subnet is attached to vnet $id"}) i= f $id eq $subnetid; } } =20 diff --git a/PVE/Network/SDN/VnetPlugin.pm b/PVE/Network/SDN/VnetPlugin.p= m index 430b3bf..6b2bcc8 100644 --- a/PVE/Network/SDN/VnetPlugin.pm +++ b/PVE/Network/SDN/VnetPlugin.pm @@ -115,7 +115,8 @@ sub on_update_hook { #verify subnet my @subnets =3D PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->= {subnets}) if $vnet_cfg->{ids}->{$vnetid}->{subnets}; foreach my $subnet (@subnets) { - raise_param_exc({ subnet =3D> "$subnet not existing"}) if !$subnet_cfg-= >{ids}->{$subnet}; + my $id =3D $subnet =3D~ s/\//-/r; + raise_param_exc({ subnet =3D> "$subnet not existing"}) if !$subnet_cfg-= >{ids}->{$id}; } } =20 --=20 2.20.1