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 2FBA49E821 for ; Tue, 28 Nov 2023 10:02:21 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 12BD413322 for ; Tue, 28 Nov 2023 10:02:21 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 28 Nov 2023 10:02:20 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3C9EB44F63 for ; Tue, 28 Nov 2023 10:02:20 +0100 (CET) Message-ID: <0e5bc165-1050-4303-8fe8-75e761a98e62@proxmox.com> Date: Tue, 28 Nov 2023 10:02:19 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Stefan Hanreich , pve-devel@lists.proxmox.com References: <20231128085851.61788-1-s.hanreich@proxmox.com> From: =?UTF-8?Q?Hannes_D=C3=BCrr?= In-Reply-To: <20231128085851.61788-1-s.hanreich@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH pve-manager] sdn: ipam: fix ipam grouping identical subnets in different vnets 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: Tue, 28 Nov 2023 09:02:21 -0000 Tested-by: Hannes Duerr On 11/28/23 09:58, Stefan Hanreich wrote: > When SDN is configured with the same subnet in two different VNets the > IPAM tree would render them wrongly. > > Reported-By: Hannes Duerr > Signed-off-by: Stefan Hanreich > --- > www/manager6/tree/DhcpTree.js | 10 +++++++--- > 1 file changed, 7 insertions(+), 3 deletions(-) > > diff --git a/www/manager6/tree/DhcpTree.js b/www/manager6/tree/DhcpTree.js > index d0b80803d..60029d3f4 100644 > --- a/www/manager6/tree/DhcpTree.js > +++ b/www/manager6/tree/DhcpTree.js > @@ -60,7 +60,11 @@ Ext.define('PVE.sdn.DhcpTree', { > zones[element.zone].children.push(vnet); > } > > - if (!(element.subnet in subnets)) { > + if (!(element.vnet in subnets)) { > + subnets[element.vnet] = {}; > + } > + > + if (!(element.subnet in subnets[element.vnet])) { > let subnet = { > name: element.subnet, > zone: element.zone, > @@ -71,13 +75,13 @@ Ext.define('PVE.sdn.DhcpTree', { > children: [], > }; > > - subnets[element.subnet] = subnet; > + subnets[element.vnet][element.subnet] = subnet; > vnets[element.vnet].children.push(subnet); > } > > element.type = 'mapping'; > element.iconCls = 'x-tree-icon-none'; > - subnets[element.subnet].children.push(element); > + subnets[element.vnet][element.subnet].children.push(element); > }); > > me.getView().setRootNode(root);