Add support of attaching nic's to the specified network labels in HyperV

rajesh-battala · rajesh-battala · commit 4f1821bf3a34 · 2013-11-21T11:55:17.000+05:30
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
@@ -336,8 +336,9 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso)
             }
 
             String publicIpAddress = "";
+            int nicCount = 0;
             // Add the Nics to the VM in the deviceId order.
-            for (int i = 0; i <= 2; i++)
+            foreach (var nc in nicInfo)
             {
                 foreach (var nic in nicInfo)
                 {
@@ -360,18 +361,23 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso)
                         }
                     }
 
-                    if (i == 2)
+                    if (nicCount == 2)
                     {
                          publicIpAddress = nic.ip;
                     }
 
-                    if (nicid == i)
+                    if (nicid == nicCount)
                     {
                         // Create network adapter
                         var newAdapter = CreateNICforVm(newVm, mac);
+                        String switchName ="";
+                        if (nic.name != null)
+                        {
+                            switchName =  nic.name;
+                        }
 
                         // connection to vswitch
-                        var portSettings = AttachNicToPort(newVm, newAdapter);
+                        var portSettings = AttachNicToPort(newVm, newAdapter, switchName);
 
                         // set vlan
                         if (vlan != null)
@@ -383,6 +389,7 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso)
                             newAdapter.Path, portSettings.Path, (vlan == null ? "No VLAN" : "VLAN " + vlan));
                     }
                 }
+                nicCount++;
             }
 
             // pass the boot args for the VM using KVP component.
@@ -459,10 +466,18 @@ public static Boolean pingResource(String ip)
             return false;
         }
 
-        private EthernetPortAllocationSettingData AttachNicToPort(ComputerSystem newVm, SyntheticEthernetPortSettingData newAdapter)
+        private EthernetPortAllocationSettingData AttachNicToPort(ComputerSystem newVm, SyntheticEthernetPortSettingData newAdapter, String vSwitchName)
         {
             // Get the virtual switch
-            VirtualEthernetSwitch vSwitch = GetExternalVirtSwitch();
+            VirtualEthernetSwitch vSwitch = GetExternalVirtSwitch(vSwitchName);
+            //check the the recevied vSwitch is the same as vSwitchName.
+            if (!vSwitchName.Equals("")  && !vSwitch.ElementName.Equals(vSwitchName))
+            {
+               var errMsg = string.Format("Internal error, coudl not find Virtual Switch with the name : " +vSwitchName);
+               var ex = new WmiException(errMsg);
+               logger.Error(errMsg, ex);
+               throw ex;
+            }
 
             // Create port for adapter
             var defaultEthernetPortSettings = EthernetPortAllocationSettingData.GetInstances(vSwitch.Scope, "InstanceID LIKE \"%Default\"");
@@ -1157,7 +1172,7 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()
         {
             // Work back from the first *bound* external NIC we find.
             var externNICs = ExternalEthernetPort.GetInstances("IsBound = TRUE");
-
+            VirtualEthernetSwitch vSwitch = null;
             // Assert
             if (externNICs.Count == 0 )
             {
@@ -1166,8 +1181,7 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()
                 logger.Error(errMsg, ex);
                 throw ex;
             }
-
-            ExternalEthernetPort externNIC = externNICs.OfType<ExternalEthernetPort>().First();
+            foreach(ExternalEthernetPort externNIC in externNICs.OfType<ExternalEthernetPort>()) { 
             // A sequence of ASSOCIATOR objects need to be traversed to get from external NIC the vswitch.
             // We use ManagementObjectSearcher objects to execute this sequence of questions
             // NB: default scope of ManagementObjectSearcher is '\\.\root\cimv2', which does not contain
@@ -1217,7 +1231,7 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()
             var vSwitchQuery = new RelatedObjectQuery(switchPort.Path.Path, VirtualEthernetSwitch.CreatedClassName);
             var vSwitchSearch = new ManagementObjectSearcher(externNIC.Scope, vSwitchQuery);
             var vSwitchCollection = new VirtualEthernetSwitch.VirtualEthernetSwitchCollection(vSwitchSearch.Get());
-        
+
             // assert
             if (vSwitchCollection.Count < 1)
             {
@@ -1226,7 +1240,12 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()
                 logger.Error(errMsg, ex);
                 throw ex;
             }
-            VirtualEthernetSwitch vSwitch = vSwitchCollection.OfType<VirtualEthernetSwitch>().First();
+            vSwitch = vSwitchCollection.OfType<VirtualEthernetSwitch>().First();
+            if (vSwitch.ElementName.Equals(vSwitchName) == true)
+            {
+                return vSwitch;
+            }
+            }
             return vSwitch;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -336,8 +336,9 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso)`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`String publicIpAddress = "";`
	`339`	`+ int nicCount = 0;`
`339`	`340`	`// Add the Nics to the VM in the deviceId order.`
`340`		`- for (int i = 0; i <= 2; i++)`
	`341`	`+ foreach (var nc in nicInfo)`
`341`	`342`	`{`
`342`	`343`	`foreach (var nic in nicInfo)`
`343`	`344`	`{`
`@@ -360,18 +361,23 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso)`
`360`	`361`	`}`
`361`	`362`	`}`
`362`	`363`
`363`		`- if (i == 2)`
	`364`	`+ if (nicCount == 2)`
`364`	`365`	`{`
`365`	`366`	`publicIpAddress = nic.ip;`
`366`	`367`	`}`
`367`	`368`
`368`		`- if (nicid == i)`
	`369`	`+ if (nicid == nicCount)`
`369`	`370`	`{`
`370`	`371`	`// Create network adapter`
`371`	`372`	`var newAdapter = CreateNICforVm(newVm, mac);`
	`373`	`+ String switchName ="";`
	`374`	`+ if (nic.name != null)`
	`375`	`+ {`
	`376`	`+ switchName = nic.name;`
	`377`	`+ }`
`372`	`378`
`373`	`379`	`// connection to vswitch`
`374`		`- var portSettings = AttachNicToPort(newVm, newAdapter);`
	`380`	`+ var portSettings = AttachNicToPort(newVm, newAdapter, switchName);`
`375`	`381`
`376`	`382`	`// set vlan`
`377`	`383`	`if (vlan != null)`
`@@ -383,6 +389,7 @@ public ComputerSystem DeployVirtualMachine(dynamic jsonObj, string systemVmIso)`
`383`	`389`	`newAdapter.Path, portSettings.Path, (vlan == null ? "No VLAN" : "VLAN " + vlan));`
`384`	`390`	`}`
`385`	`391`	`}`
	`392`	`+ nicCount++;`
`386`	`393`	`}`
`387`	`394`
`388`	`395`	`// pass the boot args for the VM using KVP component.`
`@@ -459,10 +466,18 @@ public static Boolean pingResource(String ip)`
`459`	`466`	`return false;`
`460`	`467`	`}`
`461`	`468`
`462`		`- private EthernetPortAllocationSettingData AttachNicToPort(ComputerSystem newVm, SyntheticEthernetPortSettingData newAdapter)`
	`469`	`+ private EthernetPortAllocationSettingData AttachNicToPort(ComputerSystem newVm, SyntheticEthernetPortSettingData newAdapter, String vSwitchName)`
`463`	`470`	`{`
`464`	`471`	`// Get the virtual switch`
`465`		`- VirtualEthernetSwitch vSwitch = GetExternalVirtSwitch();`
	`472`	`+ VirtualEthernetSwitch vSwitch = GetExternalVirtSwitch(vSwitchName);`
	`473`	`+ //check the the recevied vSwitch is the same as vSwitchName.`
	`474`	`+ if (!vSwitchName.Equals("") && !vSwitch.ElementName.Equals(vSwitchName))`
	`475`	`+ {`
	`476`	`+ var errMsg = string.Format("Internal error, coudl not find Virtual Switch with the name : " +vSwitchName);`
	`477`	`+ var ex = new WmiException(errMsg);`
	`478`	`+ logger.Error(errMsg, ex);`
	`479`	`+ throw ex;`
	`480`	`+ }`
`466`	`481`
`467`	`482`	`// Create port for adapter`
`468`	`483`	`var defaultEthernetPortSettings = EthernetPortAllocationSettingData.GetInstances(vSwitch.Scope, "InstanceID LIKE \"%Default\"");`
`@@ -1157,7 +1172,7 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()`
`1157`	`1172`	`{`
`1158`	`1173`	`// Work back from the first bound external NIC we find.`
`1159`	`1174`	`var externNICs = ExternalEthernetPort.GetInstances("IsBound = TRUE");`
`1160`		`-`
	`1175`	`+ VirtualEthernetSwitch vSwitch = null;`
`1161`	`1176`	`// Assert`
`1162`	`1177`	`if (externNICs.Count == 0 )`
`1163`	`1178`	`{`
`@@ -1166,8 +1181,7 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()`
`1166`	`1181`	`logger.Error(errMsg, ex);`
`1167`	`1182`	`throw ex;`
`1168`	`1183`	`}`
`1169`		`-`
`1170`		`- ExternalEthernetPort externNIC = externNICs.OfType<ExternalEthernetPort>().First();`
	`1184`	`+ foreach(ExternalEthernetPort externNIC in externNICs.OfType<ExternalEthernetPort>()) {`
`1171`	`1185`	`// A sequence of ASSOCIATOR objects need to be traversed to get from external NIC the vswitch.`
`1172`	`1186`	`// We use ManagementObjectSearcher objects to execute this sequence of questions`
`1173`	`1187`	`// NB: default scope of ManagementObjectSearcher is '\\.\root\cimv2', which does not contain`
`@@ -1217,7 +1231,7 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()`
`1217`	`1231`	`var vSwitchQuery = new RelatedObjectQuery(switchPort.Path.Path, VirtualEthernetSwitch.CreatedClassName);`
`1218`	`1232`	`var vSwitchSearch = new ManagementObjectSearcher(externNIC.Scope, vSwitchQuery);`
`1219`	`1233`	`var vSwitchCollection = new VirtualEthernetSwitch.VirtualEthernetSwitchCollection(vSwitchSearch.Get());`
`1220`		`-`
	`1234`	`+`
`1221`	`1235`	`// assert`
`1222`	`1236`	`if (vSwitchCollection.Count < 1)`
`1223`	`1237`	`{`
`@@ -1226,7 +1240,12 @@ public static VirtualEthernetSwitch GetExternalVirtSwitch()`
`1226`	`1240`	`logger.Error(errMsg, ex);`
`1227`	`1241`	`throw ex;`
`1228`	`1242`	`}`
`1229`		`- VirtualEthernetSwitch vSwitch = vSwitchCollection.OfType<VirtualEthernetSwitch>().First();`
	`1243`	`+ vSwitch = vSwitchCollection.OfType<VirtualEthernetSwitch>().First();`
	`1244`	`+ if (vSwitch.ElementName.Equals(vSwitchName) == true)`
	`1245`	`+ {`
	`1246`	`+ return vSwitch;`
	`1247`	`+ }`
	`1248`	`+ }`
`1230`	`1249`	`return vSwitch;`
`1231`	`1250`	`}`
`1232`	`1251`