deconflict sddc changes

src/TopoMojo.Abstractions/Models/VmTemplate.cs

@@ -32,6 +32,7 @@ public class VmNet
     {
         public int Id { get; set; }
         public string Net { get; set; }
+        public string Key { get; set; }
         public string Type { get; set; }
         public string Mac { get; set; }
         public string Ip { get; set; }

src/TopoMojo.vSphere/DistributedNetworkManager.cs

@@ -91,7 +91,7 @@ public override async Task<VmNetwork[]> GetVmNetworks(ManagedObjectReference mor
 
                         result.Add(new VmNetwork
                         {
-                            NetworkMOR = back.port.portgroupKey,
+                            NetworkMOR = $"DistributedVirtualPortgroup|{back.port.portgroupKey}",
                             VmName = vmName
                         });
                     }
@@ -169,7 +169,7 @@ public override void UpdateEthernetCardBacking(VirtualEthernetCard card, string
                         port = new DistributedVirtualSwitchPortConnection
                         {
                             switchUuid = _client.DvsUuid,
-                            portgroupKey = netMorName
+                            portgroupKey = netMorName.AsReference().Value
                         }
                     };
                 }

src/TopoMojo.vSphere/HypervisorService.cs

@@ -132,7 +132,8 @@ public async Task<Vm> Load(string id)
 
             Vm vm = _vmCache.Values.Where(o=>o.Id == id || o.Name == id).FirstOrDefault();
 
-            CheckProgress(vm);
+            if (vm != null)
+                CheckProgress(vm);
 
             return vm;
         }

src/TopoMojo.vSphere/NetworkManager.cs

@@ -117,7 +117,7 @@ public async Task Provision(VmTemplate template)
                         _pgAllocation[eth.Net].Counter += 1;
                     }
 
-                    eth.Net = _pgAllocation[eth.Net].Key;
+                    eth.Key = _pgAllocation[eth.Net].Key;
                 }
             }
         }

src/TopoMojo.vSphere/VimTransform.cs

@@ -129,8 +129,8 @@ private static VirtualDeviceConfigSpec GetEthernetAdapter(ref int key, VmNet nic
             if (nic.Net.StartsWith("nsx."))
             {
                 eth.backing = new VirtualEthernetCardOpaqueNetworkBackingInfo {
-                    opaqueNetworkId = nic.Net.Tag(),
-                    opaqueNetworkType = nic.Net.Untagged()
+                    opaqueNetworkId = nic.Key.Tag(),
+                    opaqueNetworkType = nic.Key.Untagged()
                 };
             }
             else if (dvsuuid.HasValue())
@@ -139,13 +139,13 @@ private static VirtualDeviceConfigSpec GetEthernetAdapter(ref int key, VmNet nic
                     port = new DistributedVirtualSwitchPortConnection
                     {
                         switchUuid = dvsuuid,
-                        portgroupKey = nic.Net
+                        portgroupKey = nic.Key.AsReference().Value
                     }
                 };
             }
             else
             {
-                eth.backing = new VirtualEthernetCardNetworkBackingInfo { deviceName = nic.Net };
+                eth.backing = new VirtualEthernetCardNetworkBackingInfo { deviceName = nic.Key };
             }
 
             devicespec = new VirtualDeviceConfigSpec();