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 CDA28603C0 for ; Thu, 24 Sep 2020 10:41:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 81FC1E82D for ; Thu, 24 Sep 2020 10:41:06 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 66F49E7AF for ; Thu, 24 Sep 2020 10:41:01 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id EF988D6848; Thu, 24 Sep 2020 10:40:54 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 24 Sep 2020 10:40:35 +0200 Message-Id: <20200924084054.611548-7-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200924084054.611548-1-aderumier@odiso.com> References: <20200924084054.611548-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.834 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 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 KHOP_HELO_FCRDNS 0.399 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [vnetplugin.pm, subnetplugin.pm] Subject: [pve-devel] [PATCH v8 pve-network 06/25] 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: Thu, 24 Sep 2020 08:41:37 -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/SubnetPlugin.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 = $vnet_cfg->{ids}->{$id}; my @subnets = PVE::Tools::split_list($vnet->{subnets}) if $vnet->{subnets}; foreach my $subnet (@subnets) { - raise_param_exc({ subnet => "$subnet is attached to vnet $id"}) if $subnet eq $subnetid; + my $id = $subnet =~ s/\//-/r; + raise_param_exc({ subnet => "$subnet is attached to vnet $id"}) if $id eq $subnetid; } } diff --git a/PVE/Network/SDN/VnetPlugin.pm b/PVE/Network/SDN/VnetPlugin.pm 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 = PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->{subnets}) if $vnet_cfg->{ids}->{$vnetid}->{subnets}; foreach my $subnet (@subnets) { - raise_param_exc({ subnet => "$subnet not existing"}) if !$subnet_cfg->{ids}->{$subnet}; + my $id = $subnet =~ s/\//-/r; + raise_param_exc({ subnet => "$subnet not existing"}) if !$subnet_cfg->{ids}->{$id}; } } -- 2.20.1