wip

cmu-sei · Nov 11, 2024 · 9a1879f · 9a1879f
1 parent 75c39f0
commit 9a1879f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/TopoMojo.Hypervisor/vSphere/NetworkManager.cs b/src/TopoMojo.Hypervisor/vSphere/NetworkManager.cs
@@ -84,7 +84,7 @@ public async Task Provision(VmTemplate template)
         {
             await Task.Delay(0);
 
-            ProvisionAll(template.Eth, template.UseUplinkSwitch).Wait();
+            await ProvisionAll(template.Eth, template.UseUplinkSwitch);
 
             foreach (var eth in template.Eth)
             {
@@ -115,6 +115,7 @@ public async Task ProvisionAll(VmNet[] nets, bool useUplinkSwitch)
                     .ToArray()
                 ;
 
+                _logger.LogDebug("AddPortGroups for {count} nets...", manifest.Length);
                 var pgs = AddPortGroups(sw, manifest).Result;
 
                 _vlanManager.Activate(

diff --git a/src/TopoMojo.Hypervisor/vSphere/NsxNetworkManager.cs b/src/TopoMojo.Hypervisor/vSphere/NsxNetworkManager.cs
@@ -171,6 +171,9 @@ public override async Task<PortGroupAllocation> AddPortGroup(string sw, VmNet et
 
         public override async Task<PortGroupAllocation[]> AddPortGroups(string sw, VmNet[] eths)
         {
+            if (eths.Length == 0)
+                return [];
+
             await InitClient();
 
             string tag = eths[0].Net.Tag();
@@ -192,7 +195,9 @@ public override async Task<PortGroupAllocation[]> AddPortGroups(string sw, VmNet
                 if (response.IsSuccessStatusCode)
                     names.Add(eth.Net);
                 else
-                    _logger.LogDebug("Failed to add SDDC PortGroup {net}", eth.Net);
+                    _logger.LogDebug("Failed to add SDDC PortGroup {net} {reason}", eth.Net, response.ReasonPhrase);
+
+                await Task.Delay(250);
             }
 
             int count = 10;
@@ -201,7 +206,7 @@ public override async Task<PortGroupAllocation[]> AddPortGroups(string sw, VmNet
             do
             {
                 await Task.Delay(1500);
-
+                _logger.LogDebug("SDDC resolving new portgroups [{count}]", count);
                 pgas = (await LoadPortGroups())
                     .Where(p => names.Contains(p.Net))
                     .ToArray()

diff --git a/src/TopoMojo.Hypervisor/vSphere/vSphereHypervisorService.cs b/src/TopoMojo.Hypervisor/vSphere/vSphereHypervisorService.cs
@@ -723,7 +723,11 @@ private async Task DeployBatch(DeploymentContext ctx)
             {
                 var eths = ctx.Templates.SelectMany(t => t.Eth).ToArray();
                 foreach (var eth in eths)
+                {
+                    if (ctx.Privileged && _vlanman.Contains(eth.Net))
+                        continue;
                     eth.Net += $"#{ctx.Id}";
+                }
                 await _hostCache.First().Value.PreDeployNets(eths, false);
             }