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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9BA94A067D for ; Thu, 9 Nov 2023 01:25:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 66999E56B for ; Thu, 9 Nov 2023 01:25:25 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [185.151.191.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 9 Nov 2023 01:25:20 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 4351E8107; Thu, 9 Nov 2023 01:25:13 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 277CD135A93; Thu, 9 Nov 2023 01:25:13 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 9 Nov 2023 01:25:09 +0100 Message-Id: <20231109002510.470617-3-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231109002510.470617-1-aderumier@odiso.com> References: <20231109002510.470617-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 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 SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - T_SPF_HELO_TEMPERROR 0.01 SPF: test of HELO record failed (temperror) URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [dhcp.pm] Subject: [pve-devel] [WIP pve-network 2/3] dhcp : add|del_ip_mapping: only add|del dhcp reservervation 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, 09 Nov 2023 00:25:25 -0000 don't try to add|del ip from ipam here Signed-off-by: Alexandre Derumier --- src/PVE/Network/SDN/Dhcp.pm | 75 +++++++++---------------------------- 1 file changed, 18 insertions(+), 57 deletions(-) diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm index e4c4078..1c32fec 100644 --- a/src/PVE/Network/SDN/Dhcp.pm +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -21,72 +21,33 @@ PVE::Network::SDN::Dhcp::Dnsmasq->register(); PVE::Network::SDN::Dhcp::Dnsmasq->init(); sub add_mapping { - my ($vmid, $vnet, $mac) = @_; + my ($vmid, $vnetid, $mac, $ip) = @_; - my $vnet_config = PVE::Network::SDN::Vnets::get_vnet($vnet, 1); - return if !$vnet_config; + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); + my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); + my $zoneid = $vnet->{zone}; + my $zone = PVE::Network::SDN::Zones::get_zone($zoneid); - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnet, 1); + my $dhcptype = $zone->{dhcp}; + return if !$dhcptype; - for my $subnet_id (keys %{$subnets}) { - my $subnet_config = $subnets->{$subnet_id}; - - next if !$subnet_config->{'dhcp-range'}; - - foreach my $dhcp_range (@{$subnet_config->{'dhcp-range'}}) { - my $dhcp_config = PVE::Network::SDN::Dhcp::get_dhcp($dhcp_range->{server}); - - if (!$dhcp_config) { - warn "Cannot find configuration for DHCP server $dhcp_range->{server}"; - next; - } - - my $ipam_plugin = PVE::Network::SDN::Ipams::Plugin->lookup('pve'); - - my $data = { - vmid => $vmid, - mac => $mac, - }; - - my $ip = $ipam_plugin->add_dhcp_ip($subnet_config, $dhcp_range, $data); - - next if !$ip; - - my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcp_config->{type}); - $dhcp_plugin->add_ip_mapping($dhcp_config, $mac, $ip); - - return $ip; - } - } + my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcptype); + $dhcp_plugin->add_ip_mapping($zoneid, $mac, $ip); } sub remove_mapping { - my ($vnet, $mac) = @_; - - my $vnet_config = PVE::Network::SDN::Vnets::get_vnet($vnet, 1); - return if !$vnet_config; - - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnet, 1); - - for my $subnet_id (keys %{$subnets}) { - my $subnet_config = $subnets->{$subnet_id}; - next if !$subnet_config->{'dhcp-range'}; + my ($vnetid, $mac) = @_; - my $ipam_plugin = PVE::Network::SDN::Ipams::Plugin->lookup('pve'); - $ipam_plugin->del_dhcp_ip($subnet_config, $mac); + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); + my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); + my $zoneid = $vnet->{zone}; + my $zone = PVE::Network::SDN::Zones::get_zone($zoneid); - foreach my $dhcp_range (@{$subnet_config->{'dhcp-range'}}) { - my $dhcp_config = PVE::Network::SDN::Dhcp::get_dhcp($dhcp_range->{server}); + my $dhcptype = $zone->{dhcp}; + return if !$dhcptype; - if (!$dhcp_config) { - warn "Cannot find configuration for DHCP server $dhcp_range->{server}"; - next; - } - - my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcp_config->{type}); - $dhcp_plugin->del_ip_mapping($dhcp_config, $mac); - } - } + my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcptype); + $dhcp_plugin->del_ip_mapping($zoneid, $mac); } sub regenerate_config { -- 2.39.2