[pve-devel] [PATCH pve-manager] sdn: ipam: fix ipam grouping identical subnets in different vnets

[pve-devel] [PATCH pve-manager] sdn: ipam: fix ipam grouping identical subnets in different vnets

[Stefan Hanreich]

When SDN is configured with the same subnet in two different VNets the
IPAM tree would render them wrongly.

Reported-By: Hannes Duerr <h.duerr@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
 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);
-- 
2.39.2

Re: [pve-devel] [PATCH pve-manager] sdn: ipam: fix ipam grouping identical subnets in different vnets

[Hannes Dürr]

Tested-by: Hannes Duerr <h.duerr@proxmox.com>

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 <h.duerr@proxmox.com>
> Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
> ---
>   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);