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 40FEC1FF09B for ; Mon, 31 Aug 2026 14:33:18 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 1746021500; Mon, 31 Aug 2026 14:33:18 +0200 (CEST) Date: Mon, 31 Aug 2026 14:33:13 +0200 From: Hannes Laimer To: Daniel Herzig Subject: Re: [pve-network v2 4/4] dhcp: make use of get_subnets_with_config Message-ID: References: <20260831110116.300798-1-d.herzig@proxmox.com> <20260831110116.300798-5-d.herzig@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260831110116.300798-5-d.herzig@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1788179580803 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.828 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: TIEUXFBWORYEQIU5QJOG2XM4LGLPYHCI X-Message-ID-Hash: TIEUXFBWORYEQIU5QJOG2XM4LGLPYHCI 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 CC: pve-devel@lists.proxmox.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On 2026-08-31 13:01, Daniel Herzig wrote: > At the given point we already have the subnet configuration by hand, > so make sure to use it, instead of inherently falling back to > re-reading '/etc/pve/sdn/.running-config' via the original > 'get_subnets($vnet_id, 1)'. > before this was `get_subnets($vnetid)`, so it did not take it from running, now, it does since `$subnet_cfg` is the running config that has the changes commited to it. this is a behaviour change, arguably this is more correct here.. currently the node PUT `../network` endpoint also calls this generate, that applies still pending configs, which is probably a bug tbh so chnage is good, but the commit message should be updated > Signed-off-by: Daniel Herzig > --- > src/PVE/Network/SDN/Dhcp.pm | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/PVE/Network/SDN/Dhcp.pm b/src/PVE/Network/SDN/Dhcp.pm > index 65e40d4..1fdec89 100644 > --- a/src/PVE/Network/SDN/Dhcp.pm > +++ b/src/PVE/Network/SDN/Dhcp.pm > @@ -94,7 +94,7 @@ sub regenerate_config { > next if $vnet->{zone} ne $zoneid; > > my $config = []; > - my $subnets = PVE::Network::SDN::Vnets::get_subnets($vnetid); > + my $subnets = PVE::Network::SDN::Vnets::get_subnets_with_config($vnetid, $subnet_cfg); > > foreach my $subnet_id (sort keys %{$subnets}) { > my $subnet_config = $subnets->{$subnet_id}; > -- > 2.47.3 > > > >