From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id 5E7D41FF0B3 for ; Wed, 09 Sep 2026 12:42:24 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 1E07221645; Wed, 09 Sep 2026 12:42:10 +0200 (CEST) From: Hannes Laimer To: pve-devel@lists.proxmox.com Subject: [PATCH pve-network v2 06/16] sdn: subnets: add dhcp-lease-time property Date: Wed, 9 Sep 2026 12:41:34 +0200 Message-ID: <20260909104144.1110031-7-h.laimer@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260909104144.1110031-1-h.laimer@proxmox.com> References: <20260909104144.1110031-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: 1788950507518 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.556 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: 3NACK7ZKGRLQ37GGU3SOQS3KIDCQRXRV X-Message-ID-Hash: 3NACK7ZKGRLQ37GGU3SOQS3KIDCQRXRV 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: Lease time is the convergence knob for mapping edits, a client picks up a changed record at the latest one lease after the edit. Make it configurable per subnet for dhcp backends that honor it. Signed-off-by: Hannes Laimer --- 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 f3c7739..de7420a 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -192,7 +192,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 e2a0e50..29edf7b 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 c1878dc..3e78ba9 100755 --- a/src/test/run_test_vnets_blackbox.pl +++ b/src/test/run_test_vnets_blackbox.pl @@ -334,6 +334,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" }); } @@ -1083,6 +1088,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, 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_ipam_cache_misses { my $test_name = (split(/::/, (caller(0))[3]))[-1]; my $zoneid = "TESTZONE"; -- 2.47.3