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 3C45960389 for ; Thu, 24 Sep 2020 10:41:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12623E7D9 for ; Thu, 24 Sep 2020 10:41:03 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4EF8BE79E for ; Thu, 24 Sep 2020 10:41:01 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id D97B2E89BF; 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:31 +0200 Message-Id: <20200924084054.611548-3-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.887 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] Subject: [pve-devel] [PATCH v8 pve-network 02/25] 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: Thu, 24 Sep 2020 08:41:33 -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.pm index 384358c..47ca50b 100644 --- a/PVE/Network/SDN/VnetPlugin.pm +++ b/PVE/Network/SDN/VnetPlugin.pm @@ -68,16 +68,11 @@ sub properties { description => "alias name of the vnet", optional => 1, }, - ipv4 => { - description => "Anycast router ipv4 address.", - type => 'string', format => 'CIDRv4', - optional => 1, - }, - ipv6 => { - description => "Anycast router ipv6 address.", - type => 'string', format => 'CIDRv6', + subnets => { + type => 'string', + description => "Subnets list", optional => 1, - }, + }, mac => { type => 'string', description => "Anycast router mac address", @@ -91,8 +86,7 @@ sub options { zone => { optional => 0}, tag => { optional => 1}, alias => { optional => 1 }, - ipv4 => { optional => 1 }, - ipv6 => { optional => 1 }, + subnets => { optional => 1 }, mac => { optional => 1 }, vlanaware => { optional => 1 }, }; @@ -105,7 +99,7 @@ sub on_delete_hook { } sub on_update_hook { - my ($class, $vnetid, $vnet_cfg) = @_; + my ($class, $vnetid, $vnet_cfg, $subnet_cfg) = @_; # verify that tag is not already defined in another vnet if (defined($vnet_cfg->{ids}->{$vnetid}->{tag})) { my $tag = $vnet_cfg->{ids}->{$vnetid}->{tag}; @@ -117,6 +111,10 @@ sub on_update_hook { } } } + #verify subnet + my $subnets = $vnet_cfg->{ids}->{$vnetid}->{subnets}; + my @subnets = PVE::Tools::split_list($vnet_cfg->{ids}->{$vnetid}->{subnets}) if $plugin_config->{'peers'}; + } 1; -- 2.20.1