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 7BC829A35F for ; Fri, 17 Nov 2023 12:40:56 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2A8FB30BFE for ; Fri, 17 Nov 2023 12:40:23 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Fri, 17 Nov 2023 12:40:19 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 47DC32C343A; Fri, 17 Nov 2023 12:40:18 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Fri, 17 Nov 2023 12:39:47 +0100 Message-Id: <20231117114011.834002-10-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231117114011.834002-1-s.hanreich@proxmox.com> References: <20231117114011.834002-1-s.hanreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.485 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 v4 pve-network 09/33] sdn: dhcp: add helper for creating DHCP leases 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, 17 Nov 2023 11:40:56 -0000 This helper can be used to create DHCP entries for a specific zone. It is used by the API to create DHCP leases for VMs/CTs. Co-Authored-By: Alexandre Derumier Signed-off-by: Stefan Hanreich --- src/PVE/Network/SDN/Dhcp.pm | 115 +++++++++++++++++++++++++++++++++++ src/PVE/Network/SDN/Makefile | 2 +- 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 src/PVE/Network/SDN/Dhcp.pm diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm new file mode 100644 index 0000000..a05b441 --- /dev/null +++ b/src/PVE/Network/SDN/Dhcp.pm @@ -0,0 +1,115 @@ +package PVE::Network::SDN::Dhcp; + +use strict; +use warnings; + +use PVE::Cluster qw(cfs_read_file); + +use PVE::Network::SDN; +use PVE::Network::SDN::SubnetPlugin; +use PVE::Network::SDN::Dhcp qw(config); +use PVE::Network::SDN::Subnets qw(sdn_subnets_config config get_dhcp_ranges); +use PVE::Network::SDN::Dhcp::Plugin; +use PVE::Network::SDN::Dhcp::Dnsmasq; + +use PVE::INotify qw(nodename); + +PVE::Network::SDN::Dhcp::Plugin->init(); + +PVE::Network::SDN::Dhcp::Dnsmasq->register(); +PVE::Network::SDN::Dhcp::Dnsmasq->init(); + +sub add_mapping { + my ($vnetid, $mac, $ip4, $ip6) = @_; + + my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); + return if !$vnet; + + my $zoneid = $vnet->{zone}; + my $zone = PVE::Network::SDN::Zones::get_zone($zoneid); + + return if !$zone->{ipam} || !$zone->{dhcp}; + + my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($zone->{dhcp}); + $dhcp_plugin->add_ip_mapping($zoneid, $mac, $ip4) if $ip4; + $dhcp_plugin->add_ip_mapping($zoneid, $mac, $ip6) if $ip6; +} + +sub remove_mapping { + my ($vnetid, $mac) = @_; + + my $vnet = PVE::Network::SDN::Vnets::get_vnet($vnetid); + return if !$vnet; + + my $zoneid = $vnet->{zone}; + my $zone = PVE::Network::SDN::Zones::get_zone($zoneid); + + return if !$zone->{ipam} || !$zone->{dhcp}; + + my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($zone->{dhcp}); + $dhcp_plugin->del_ip_mapping($zoneid, $mac); +} + +sub regenerate_config { + my ($reload) = @_; + + my $cfg = PVE::Network::SDN::running_config(); + + my $zone_cfg = $cfg->{zones}; + my $subnet_cfg = $cfg->{subnets}; + return if !$zone_cfg && !$subnet_cfg; + + my $nodename = PVE::INotify::nodename(); + + my $plugins = PVE::Network::SDN::Dhcp::Plugin->lookup_types(); + + foreach my $plugin_name (@$plugins) { + my $plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($plugin_name); + eval { $plugin->before_regenerate() }; + die "Could not run before_regenerate for DHCP plugin $plugin_name $@\n" if $@; + } + + foreach my $zoneid (sort keys %{$zone_cfg->{ids}}) { + my $zone = $zone_cfg->{ids}->{$zoneid}; + next if !$zone->{dhcp}; + + my $dhcp_plugin_name = $zone->{dhcp}; + my $dhcp_plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($dhcp_plugin_name); + + die "Could not find DHCP plugin: $dhcp_plugin_name" if !$dhcp_plugin; + + eval { $dhcp_plugin->before_configure($zoneid) }; + die "Could not run before_configure for DHCP server $zoneid $@\n" if $@; + + + foreach my $subnet_id (keys %{$subnet_cfg->{ids}}) { + my $subnet_config = PVE::Network::SDN::Subnets::sdn_subnets_config($subnet_cfg, $subnet_id); + my $dhcp_ranges = PVE::Network::SDN::Subnets::get_dhcp_ranges($subnet_config); + + my ($zone, $subnet_network, $subnet_mask) = split(/-/, $subnet_id); + next if $zone ne $zoneid; + next if !$dhcp_ranges; + + eval { $dhcp_plugin->configure_subnet($zoneid, $subnet_config) }; + warn "Could not configure subnet $subnet_id: $@\n" if $@; + + foreach my $dhcp_range (@$dhcp_ranges) { + eval { $dhcp_plugin->configure_range($zoneid, $subnet_config, $dhcp_range) }; + warn "Could not configure DHCP range for $subnet_id: $@\n" if $@; + } + } + + eval { $dhcp_plugin->after_configure($zoneid) }; + warn "Could not run after_configure for DHCP server $zoneid $@\n" if $@; + + } + + foreach my $plugin_name (@$plugins) { + my $plugin = PVE::Network::SDN::Dhcp::Plugin->lookup($plugin_name); + + eval { $plugin->after_regenerate() }; + warn "Could not run after_regenerate for DHCP plugin $plugin_name $@\n" if $@; + } +} + +1; diff --git a/src/PVE/Network/SDN/Makefile b/src/PVE/Network/SDN/Makefile index 848f7d4..3e6e5fb 100644 --- a/src/PVE/Network/SDN/Makefile +++ b/src/PVE/Network/SDN/Makefile @@ -1,4 +1,4 @@ -SOURCES=Vnets.pm VnetPlugin.pm Zones.pm Controllers.pm Subnets.pm SubnetPlugin.pm Ipams.pm Dns.pm +SOURCES=Vnets.pm VnetPlugin.pm Zones.pm Controllers.pm Subnets.pm SubnetPlugin.pm Ipams.pm Dns.pm Dhcp.pm PERL5DIR=${DESTDIR}/usr/share/perl5 -- 2.39.2