handle duplicate portgroups

cmu-sei · Nov 19, 2024 · fc76028 · fc76028
1 parent 7773aec
commit fc76028
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/TopoMojo.Hypervisor/vSphere/NetworkManager.cs b/src/TopoMojo.Hypervisor/vSphere/NetworkManager.cs
@@ -35,7 +35,7 @@ public async Task Initialize()
             foreach (var pg in existing)
                 pg.Timestamp = ts;
 
-            _pgAllocation = existing.ToDictionary(p => p.Net);
+            _pgAllocation = existing.DistinctBy(p => p.Net).ToDictionary(p => p.Net);
 
             _vlanManager.Activate(
                 _pgAllocation.Values.Select(p => new Vlan

diff --git a/src/TopoMojo.Hypervisor/vSphere/NsxNetworkManager.cs b/src/TopoMojo.Hypervisor/vSphere/NsxNetworkManager.cs
@@ -295,6 +295,9 @@ config.defaultPortConfig is VMwareDVSPortSetting setting
                 }
             }
 
+            string info = string.Join('\n', [.. list.Select(p => $"{p.Net}::{p.Key}")]);
+            _logger.LogDebug("{info}", info);
+
             return [.. list];
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -295,6 +295,9 @@ config.defaultPortConfig is VMwareDVSPortSetting setting @@
                     }
                 }
+                string info = string.Join('\n', [.. list.Select(p => $"{p.Net}::{p.Key}")]);
+                _logger.LogDebug("{info}", info);
                 return [.. list];
             }
@@ Expand Down @@