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 666039C6C7 for ; Wed, 22 Nov 2023 13:29:52 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4BE9517D9C for ; Wed, 22 Nov 2023 13:29:52 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Wed, 22 Nov 2023 13:29:51 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 7EA262C1FCE; Wed, 22 Nov 2023 13:29:51 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Wed, 22 Nov 2023 13:29:50 +0100 Message-Id: <20231122122951.215905-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.432 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network] ipam: improve update / delete behavior 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: Wed, 22 Nov 2023 12:29:52 -0000 Currently when updating or deleting a mapping in the IPAM we would delete all existing entries in the IPAM with that mac address. Now we only delete the specific entry we are updating / deleting. Signed-off-by: Stefan Hanreich --- src/PVE/API2/Network/SDN/Ips.pm | 20 +++++++++++++------- src/PVE/Network/SDN/Subnets.pm | 3 +++ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/PVE/API2/Network/SDN/Ips.pm b/src/PVE/API2/Network/SDN/Ips.pm index 6989b9b..0003b2a 100644 --- a/src/PVE/API2/Network/SDN/Ips.pm +++ b/src/PVE/API2/Network/SDN/Ips.pm @@ -28,6 +28,11 @@ __PACKAGE__->register_method ({ zone => get_standard_option('pve-sdn-zone-id'), vnet => get_standard_option('pve-sdn-vnet-id'), mac => get_standard_option('mac-addr'), + ip => { + type => 'string', + format => 'ip', + description => 'The IP address to delete', + }, }, }, returns => { type => 'null' }, @@ -36,13 +41,12 @@ __PACKAGE__->register_method ({ my $vnet = extract_param($param, 'vnet'); my $mac = extract_param($param, 'mac'); + my $ip = extract_param($param, 'ip'); eval { - PVE::Network::SDN::Vnets::del_ips_from_mac($vnet, $mac); + PVE::Network::SDN::Vnets::del_ip($vnet, $ip, '', $mac); }; - my $error = $@; - - die "$error\n" if $error; + die "$@\n" if $@; return undef; }, @@ -117,7 +121,10 @@ __PACKAGE__->register_method ({ my $vmid = extract_param($param, 'vmid'); my $ip = extract_param($param, 'ip'); - my ($old_ip4, $old_ip6) = PVE::Network::SDN::Vnets::del_ips_from_mac($vnet, $mac, ''); + my ($old_ip4, $old_ip6) = PVE::Network::SDN::Vnets::get_ips_from_mac($vnet, $mac); + my $old_ip = (Net::IP::ip_get_version($ip) == 4) ? $old_ip4 : $old_ip6; + + PVE::Network::SDN::Vnets::del_ip($vnet, $old_ip, '', $mac); eval { PVE::Network::SDN::Vnets::add_ip($vnet, $ip, '', $mac, $vmid); @@ -125,8 +132,7 @@ __PACKAGE__->register_method ({ my $error = $@; if ($error) { - PVE::Network::SDN::Vnets::add_ip($vnet, $old_ip4, '', $mac, $vmid) if $old_ip4; - PVE::Network::SDN::Vnets::add_ip($vnet, $old_ip6, '', $mac, $vmid) if $old_ip6; + PVE::Network::SDN::Vnets::add_ip($vnet, $old_ip, '', $mac, $vmid); } die "$error\n" if $error; diff --git a/src/PVE/Network/SDN/Subnets.pm b/src/PVE/Network/SDN/Subnets.pm index 8e2a6aa..8f113b4 100644 --- a/src/PVE/Network/SDN/Subnets.pm +++ b/src/PVE/Network/SDN/Subnets.pm @@ -305,6 +305,9 @@ sub add_ip { $plugin->add_ip($plugin_config, $subnetid, $subnet, $ip, $hostname, $mac, $vmid, $is_gateway); }; die $@ if $@; + + eval { PVE::Network::SDN::Ipams::add_cache_mac_ip($mac, $ip) if $mac; }; + warn $@ if $@; } eval { -- 2.39.2