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 1A388605B9 for ; Thu, 24 Sep 2020 10:42:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4EE68E930 for ; Thu, 24 Sep 2020 10:41:23 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id DCBECE7D5 for ; Thu, 24 Sep 2020 10:41:01 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 273F0D6850; Thu, 24 Sep 2020 10:40:55 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 24 Sep 2020 10:40:43 +0200 Message-Id: <20200924084054.611548-15-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.639 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. [subnets.pm, ipams.pm, vnets.pm] Subject: [pve-devel] [PATCH v8 pve-network 14/25] vnets: add del_ip + rework add_ip/find_free_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: Thu, 24 Sep 2020 08:42:05 -0000 Signed-off-by: Alexandre Derumier --- PVE/Network/SDN/Ipams.pm | 12 -------- PVE/Network/SDN/Subnets.pm | 60 ++++++++++++++++++++++++++++++++++++++ PVE/Network/SDN/Vnets.pm | 47 ++++++++++------------------- 3 files changed, 75 insertions(+), 44 deletions(-) diff --git a/PVE/Network/SDN/Ipams.pm b/PVE/Network/SDN/Ipams.pm index b634020..a979d46 100644 --- a/PVE/Network/SDN/Ipams.pm +++ b/PVE/Network/SDN/Ipams.pm @@ -64,17 +64,5 @@ sub complete_sdn_vnet { return $cmdname eq 'add' ? [] : [ PVE::Network::SDN::Vnets::sdn_ipams_ids($cfg) ]; } -sub next_free_ip { - my ($subnetid, $subnet) = @_; - - my $ipam_cfg = PVE::Network::SDN::Ipams::config(); - my $ipamid = $subnet->{ipam}; - return if !$ipamid; - - my $plugin_config = $ipam_cfg->{ids}->{$ipamid}; - my $plugin = PVE::Network::SDN::Ipams::Plugin->lookup($plugin_config->{type}); - my $ip = $plugin->add_next_freeip($plugin_config, $subnetid, $subnet); - return $ip; -} 1; diff --git a/PVE/Network/SDN/Subnets.pm b/PVE/Network/SDN/Subnets.pm index 454a9cf..3ce2d44 100644 --- a/PVE/Network/SDN/Subnets.pm +++ b/PVE/Network/SDN/Subnets.pm @@ -3,8 +3,10 @@ package PVE::Network::SDN::Subnets; use strict; use warnings; +use Net::Subnet qw(subnet_matcher); use PVE::Cluster qw(cfs_read_file cfs_write_file cfs_lock_file); +use PVE::Network::SDN::Ipams; use PVE::Network::SDN::SubnetPlugin; PVE::Network::SDN::SubnetPlugin->register(); PVE::Network::SDN::SubnetPlugin->init(); @@ -52,4 +54,62 @@ sub get_subnet { return $subnet; } +sub find_ip_subnet { + my ($ip, $subnetslist) = @_; + + my $subnets_cfg = PVE::Network::SDN::Subnets::config(); + my @subnets = PVE::Tools::split_list($subnetslist) if $subnetslist; + + my $subnet = undef; + my $subnetid = undef; + + 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; + } + die "can't find any subnet for ip $ip" if !$subnet; + + return ($subnetid, $subnet); +} + +sub next_free_ip { + my ($subnetid, $subnet) = @_; + + my $ipamid = $subnet->{ipam}; + return if !$ipamid; + + 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}); + my $ip = $plugin->add_next_freeip($plugin_config, $subnetid, $subnet); + return $ip; +} + +sub add_ip { + my ($subnetid, $subnet, $ip) = @_; + + my $ipamid = $subnet->{ipam}; + return if !$ipamid; + + 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); +} + +sub del_ip { + my ($subnetid, $subnet, $ip) = @_; + + my $ipamid = $subnet->{ipam}; + return if !$ipamid; + + 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->del_ip($plugin_config, $subnetid, $ip); +} + 1; diff --git a/PVE/Network/SDN/Vnets.pm b/PVE/Network/SDN/Vnets.pm index 07bc9ff..6ea3a9a 100644 --- a/PVE/Network/SDN/Vnets.pm +++ b/PVE/Network/SDN/Vnets.pm @@ -4,11 +4,8 @@ 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; use PVE::Network::SDN::VnetPlugin; PVE::Network::SDN::VnetPlugin->register(); @@ -58,12 +55,10 @@ sub get_vnet { } sub get_next_free_ip { - my ($vnetid, $ipversion) = @_; + my ($vnet, $ipversion) = @_; $ipversion = 4 if !$ipversion; - 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 $ip = undef; my $subnet = undef; @@ -76,7 +71,7 @@ sub get_next_free_ip { $subnet = $subnets_cfg->{ids}->{$subnetid}; if ($subnet && $subnet->{ipam}) { eval { - $ip = PVE::Network::SDN::Ipams::next_free_ip($subnetid, $subnet); + $ip = PVE::Network::SDN::Subnets::next_free_ip($subnetid, $subnet); }; warn $@ if $@; } @@ -84,39 +79,27 @@ sub get_next_free_ip { } die "can't find any free ip" if !$ip && $subnetcount > 0; - $subnet->{freeip} = $ip; - return $subnet; + return $ip; } sub add_ip { - my ($vnetid, $cidr, $name) = @_; + my ($vnet, $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); + my ($subnetid, $subnet) = PVE::Network::SDN::Subnets::find_ip_subnet($ip, $vnet->{subnets}); + return if !$subnet->{ipam}; - 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; + PVE::Network::SDN::Subnets::add_ip($subnetid, $subnet, $ip); +} + +sub del_ip { + my ($vnet, $cidr) = @_; + + my ($ip, $mask) = split(/\//, $cidr); + my ($subnetid, $subnet) = PVE::Network::SDN::Subnets::find_ip_subnet($ip, $vnet->{subnets}); 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 $@; + PVE::Network::SDN::Subnets::del_ip($subnetid, $subnet, $ip); } 1; -- 2.20.1