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 BEA0668DF8 for ; Fri, 28 Aug 2020 14:37:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C7CA20F6A for ; Fri, 28 Aug 2020 14:37:10 +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 6EB5620E4C for ; Fri, 28 Aug 2020 14:37:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 567E615F9DAB; Fri, 28 Aug 2020 14:36:57 +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 x3qFwH-J8xEO; Fri, 28 Aug 2020 14:36:57 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mailpro.odiso.net (Postfix) with ESMTP id 3D34115F9E14; Fri, 28 Aug 2020 14:36:57 +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 FLULI1pVQNH7; Fri, 28 Aug 2020 14:36:57 +0200 (CEST) Received: from pve.fritz.box (unknown [213.211.148.86]) by mailpro.odiso.net (Postfix) with ESMTPSA id 0B2F715F9E10; Fri, 28 Aug 2020 14:36:57 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Fri, 28 Aug 2020 14:36:41 +0200 Message-Id: <20200828123649.11125-14-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200828123649.11125-1-aderumier@odiso.com> References: <20200828123649.11125-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address 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. [vnets.pm] Subject: [pve-devel] [PATCH v7 pve-network 13/21] vnets: add add_ip 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, 28 Aug 2020 12:37:11 -0000 --- PVE/Network/SDN/Vnets.pm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index 0de3fd5..07bc9ff 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -4,7 +4,9 @@ use strict; use warnings; =20 use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); +use PVE::Exception qw(raise_param_exc raise_perm_exc raise); use Net::IP; +use Net::Subnet qw(subnet_matcher); use PVE::Network::SDN::Subnets; use PVE::Network::SDN::Ipams; =20 @@ -86,4 +88,35 @@ sub get_next_free_ip { return $subnet; } =20 +sub add_ip { + my ($vnetid, $cidr, $name) =3D @_; + + my $vnets_cfg =3D PVE::Network::SDN::Vnets::config(); + my $subnets_cfg =3D PVE::Network::SDN::Subnets::config(); + my $vnet =3D $vnets_cfg->{ids}->{$vnetid}; + my @subnets =3D PVE::Tools::split_list($vnet->{subnets}) if $vnet->{= subnets}; + my $subnet =3D undef; + my $subnetid =3D undef; + my ($ip, $mask) =3D split(/\//, $cidr); + + foreach my $s (@subnets) { + my $subnet_matcher =3D subnet_matcher($s); + next if !$subnet_matcher->($ip); + $subnetid =3D $s =3D~ s/\//-/r; + $subnet =3D $subnets_cfg->{ids}->{$subnetid}; + last; + } + raise_param_exc({'ip' =3D> "can't find any subnet attached to vnet = $vnetid for ip $ip"}) if !$subnet; + return if !$subnet->{ipam}; + + eval { + my $ipamid =3D $subnet->{ipam}; + my $ipam_cfg =3D PVE::Network::SDN::Ipams::config(); + my $plugin_config =3D $ipam_cfg->{ids}->{$ipamid}; + my $plugin =3D PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config-= >{type}); + $plugin->add_ip($plugin_config, $subnetid, $ip); + }; + raise_param_exc({'ip' =3D> $@}) if $@; +} + 1; --=20 2.20.1