public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Alexandre Derumier <aderumier@odiso.com>
To: pve-devel@pve.proxmox.com
Subject: [pve-devel] [PATCH v4 pve-network 06/12] vnets: subnets: use cidr
Date: Tue, 28 Jul 2020 12:59:52 +0200	[thread overview]
Message-ID: <20200728105958.18313-7-aderumier@odiso.com> (raw)
In-Reply-To: <20200728105958.18313-1-aderumier@odiso.com>

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 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




  parent reply	other threads:[~2020-07-28 11:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-28 10:59 [pve-devel] [PATCH v4 pve-network 00/12] sdn : add subnets management Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 01/12] add subnet plugin Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 02/12] vnets: add subnets Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 03/12] add subnets verifications hooks Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 04/12] zones: simple|evpn: add gateway ip from subnets to vnet Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 05/12] zone: add vnet_update_hook Alexandre Derumier
2020-07-28 10:59 ` Alexandre Derumier [this message]
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 07/12] subnet: fix on_delete_hook Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 08/12] api2: subnet create: convert cidr to subnetid Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 09/12] api2: increase version on apply/reload only Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 10/12] add ipams plugins Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 11/12] add pve internal ipam plugin Alexandre Derumier
2020-07-28 10:59 ` [pve-devel] [PATCH v4 pve-network 12/12] vnets: find_free_ip : add ipversion detection Alexandre Derumier

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=20200728105958.18313-7-aderumier@odiso.com \
    --to=aderumier@odiso.com \
    --cc=pve-devel@pve.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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal