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 77F43677F8 for ; Fri, 31 Jul 2020 19:17:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 443AD1EDB5 for ; Fri, 31 Jul 2020 19:17:00 +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 243091ED82 for ; Fri, 31 Jul 2020 19:16:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 690BC122E4E4; Fri, 31 Jul 2020 19:16:49 +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 yn3883uBqDiB; Fri, 31 Jul 2020 19:16:49 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 51E79122E4E7; Fri, 31 Jul 2020 19:16:49 +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 iZttNJ5zDFMU; Fri, 31 Jul 2020 19:16:49 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id 21A09122E4E4; Fri, 31 Jul 2020 19:16:49 +0200 (CEST) From: Alexandre Derumier To: pve-devel@pve.proxmox.com Date: Fri, 31 Jul 2020 19:16:31 +0200 Message-Id: <20200731171643.13180-3-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200731171643.13180-1-aderumier@odiso.com> References: <20200731171643.13180-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. [vnetplugin.pm] Subject: [pve-devel] [PATCH v5 pve-network 02/14] vnets: add subnets 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, 31 Jul 2020 17:17:00 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/VnetPlugin.pm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/PVE/Network/SDN/VnetPlugin.pm b/PVE/Network/SDN/VnetPlugin.p= m index 384358c..47ca50b 100644 --- a/PVE/Network/SDN/VnetPlugin.pm +++ b/PVE/Network/SDN/VnetPlugin.pm @@ -68,16 +68,11 @@ sub properties { description =3D> "alias name of the vnet", optional =3D> 1, }, - ipv4 =3D> { - description =3D> "Anycast router ipv4 address.", - type =3D> 'string', format =3D> 'CIDRv4', - optional =3D> 1, - }, - ipv6 =3D> { - description =3D> "Anycast router ipv6 address.", - type =3D> 'string', format =3D> 'CIDRv6', + subnets =3D> { + type =3D> 'string', + description =3D> "Subnets list", optional =3D> 1, - }, + }, mac =3D> { type =3D> 'string', description =3D> "Anycast router mac address", @@ -91,8 +86,7 @@ sub options { zone =3D> { optional =3D> 0}, tag =3D> { optional =3D> 1}, alias =3D> { optional =3D> 1 }, - ipv4 =3D> { optional =3D> 1 }, - ipv6 =3D> { optional =3D> 1 }, + subnets =3D> { optional =3D> 1 }, mac =3D> { optional =3D> 1 }, vlanaware =3D> { optional =3D> 1 }, }; @@ -105,7 +99,7 @@ sub on_delete_hook { } =20 sub on_update_hook { - my ($class, $vnetid, $vnet_cfg) =3D @_; + my ($class, $vnetid, $vnet_cfg, $subnet_cfg) =3D @_; # verify that tag is not already defined in another vnet if (defined($vnet_cfg->{ids}->{$vnetid}->{tag})) { my $tag =3D $vnet_cfg->{ids}->{$vnetid}->{tag}; @@ -117,6 +111,10 @@ sub on_update_hook { } } } + #verify subnet + my $subnets =3D $vnet_cfg->{ids}->{$vnetid}->{subnets}; + my @subnets =3D PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->= {subnets}) if $plugin_config->{'peers'}; + } =20 1; --=20 2.20.1