From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 48F7A1FF0C0 for ; Wed, 21 Oct 2026 10:46:07 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 2E5E521628; Wed, 21 Oct 2026 10:45:49 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH pve-network v4 09/20] sdn: dhcp: make the lease time configurable per subnet Date: Wed, 21 Oct 2026 10:44:34 +0200 Message-ID: <20261021084445.462195-10-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261021084445.462195-1-h.laimer@proxmox.com> References: <20261021084445.462195-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1792572310921 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.372 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: EEJ27AH27KCZP27DOBCFH3X6J3L7MYMW X-Message-ID-Hash: EEJ27AH27KCZP27DOBCFH3X6J3L7MYMW X-MailFrom: h.laimer@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: dnsmasq hands out infinite leases, so a guest asks for its address again only at its next reboot or network restart. A finite lease makes it renew within the lease time. An address changed in the IPAM goes to dnsmasq on the node the change is made on, so a guest there picks up the new address at its next renewal. Guests on other nodes get it only at their next start there. A subnet without a lease time keeps infinite leases. Signed-off-by: Hannes Laimer Reviewed-by: Stefan Hanreich Tested-by: Stefan Hanreich --- src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 3 +- src/PVE/Network/SDN/SubnetPlugin.pm | 11 +++++++ src/test/run_test_vnets_blackbox.pl | 51 +++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index 2d18706f..79315e0f 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -188,7 +188,8 @@ sub configure_subnet { $mask = join('.', unpack("C4", pack("N", $mask))); } - push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,infinite"; + my $lease = $subnet_config->{'dhcp-lease-time'} // 'infinite'; + push @{$config}, "dhcp-range=set:$tag,$network,static,$mask,$lease"; my $option_string; if (ip_is_ipv6($subnet_config->{network})) { diff --git a/src/PVE/Network/SDN/SubnetPlugin.pm b/src/PVE/Network/SDN/SubnetPlugin.pm index e2a0e50d..29edf7b6 100644 --- a/src/PVE/Network/SDN/SubnetPlugin.pm +++ b/src/PVE/Network/SDN/SubnetPlugin.pm @@ -177,6 +177,16 @@ sub properties { description => 'IP address for the DNS server', optional => 1, }, + 'dhcp-lease-time' => { + type => 'integer', + minimum => 60, + maximum => 4294967295, + description => + 'Lease time in seconds for DHCP answers. Without it dnsmasq hands out' + . ' infinite leases, and it raises anything below two minutes to two' + . ' minutes.', + optional => 1, + }, }; } @@ -189,6 +199,7 @@ sub options { dnszoneprefix => { optional => 1 }, 'dhcp-range' => { optional => 1 }, 'dhcp-dns-server' => { optional => 1 }, + 'dhcp-lease-time' => { optional => 1 }, }; } diff --git a/src/test/run_test_vnets_blackbox.pl b/src/test/run_test_vnets_blackbox.pl index 33a5b44e..7bc18de1 100755 --- a/src/test/run_test_vnets_blackbox.pl +++ b/src/test/run_test_vnets_blackbox.pl @@ -335,6 +335,11 @@ sub create_subnet { PVE::API2::Network::SDN::Subnets->create($params); } +sub update_subnet { + my ($params) = @_; + PVE::API2::Network::SDN::Subnets->update($params); +} + sub get_ipam_entries { return PVE::API2::Network::SDN::Ipams->ipamindex({ ipam => "pve" }); } @@ -1250,6 +1255,52 @@ sub test_dnsmasq_mapping_push { run_test(\&test_dnsmasq_mapping_push); +sub test_dnsmasq_lease_time { + my $test_name = (split(/::/, (caller(0))[3]))[-1]; + my $zoneid = "TESTZONE"; + my $vnetid = "testvnet"; + + # the subnet's lease time reaches the range, and infinite stays the default + create_zone({ + type => "simple", + dhcp => "dnsmasq", + ipam => "pve", + zone => $zoneid, + }); + create_vnet({ + type => "vnet", + zone => $zoneid, + vnet => $vnetid, + }); + create_subnet({ + type => "subnet", + vnet => $vnetid, + subnet => "10.0.0.0/24", + gateway => "10.0.0.1", + 'dhcp-range' => ["start-address=10.0.0.100,end-address=10.0.0.200"], + }); + my $range = sub { + my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid, 1); + my $config = []; + for my $id (sort keys %$subnets) { + PVE::Network::SDN::Dhcp::Dnsmasq->configure_subnet( + $config, $zoneid, $vnetid, $subnets->{$id}, + ); + } + my ($line) = grep { m/^dhcp-range=/ } @$config; + return $line; + }; + like($range->(), qr/,infinite$/, "$test_name: no lease time means infinite leases"); + update_subnet({ + vnet => $vnetid, + subnet => "$zoneid-10.0.0.0-24", + 'dhcp-lease-time' => 300, + }); + like($range->(), qr/,300$/, "$test_name: the lease time reaches the range"); +} + +run_test(\&test_dnsmasq_lease_time); + sub test_dnsmasq_dual_stack_and_sweep { my $test_name = (split(/::/, (caller(0))[3]))[-1]; my $zoneid = "TESTZONE"; -- 2.47.3