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 0DA6363BA7 for ; Mon, 5 Oct 2020 17:09:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E32B1C254 for ; Mon, 5 Oct 2020 17:08:44 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6D3B81C121 for ; Mon, 5 Oct 2020 17:08:31 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id AB4C0E89A9; Mon, 5 Oct 2020 17:08:24 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 5 Oct 2020 17:08:10 +0200 Message-Id: <20201005150823.462387-14-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201005150823.462387-1-aderumier@odiso.com> References: <20201005150823.462387-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.479 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.248 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.398 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 Subject: [pve-devel] [PATCH v9 pve-network 13/26] 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: Mon, 05 Oct 2020 15:09:35 -0000 Signed-off-by: Alexandre Derumier --- 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; 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; @@ -86,4 +88,35 @@ sub get_next_free_ip { return $subnet; } +sub add_ip { + my ($vnetid, $cidr, $name) = @_; + + my $vnets_cfg = PVE::Network::SDN::Vnets::config(); + my $subnets_cfg = PVE::Network::SDN::Subnets::config(); + my $vnet = $vnets_cfg->{ids}->{$vnetid}; + my @subnets = PVE::Tools::split_list($vnet->{subnets}) if $vnet->{subnets}; + my $subnet = undef; + my $subnetid = undef; + my ($ip, $mask) = split(/\//, $cidr); + + foreach my $s (@subnets) { + my $subnet_matcher = subnet_matcher($s); + next if !$subnet_matcher->($ip); + $subnetid = $s =~ s/\//-/r; + $subnet = $subnets_cfg->{ids}->{$subnetid}; + last; + } + raise_param_exc({'ip' => "can't find any subnet attached to vnet $vnetid for ip $ip"}) if !$subnet; + return if !$subnet->{ipam}; + + eval { + my $ipamid = $subnet->{ipam}; + my $ipam_cfg = PVE::Network::SDN::Ipams::config(); + my $plugin_config = $ipam_cfg->{ids}->{$ipamid}; + my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type}); + $plugin->add_ip($plugin_config, $subnetid, $ip); + }; + raise_param_exc({'ip' => $@}) if $@; +} + 1; -- 2.20.1