apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3468 Failed to Deploy Instances with multiple VMWARE clusters when DVS is enabled at the Zone level

Browse Source 
Fixing cluster level override of zone level specified vSwitch settings.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
This commit is contained in:
Sateesh Chodapuneedi 2013-07-29 03:04:23 +05:30
parent 6f84e74a68
commit 57d96308c1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
View File

@ -3249,6 +3249,12 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
// return Pair<switch name, vlan tagging> // return Pair<switch name, vlan tagging>
private Pair<String, String> getTargetSwitch(NicTO nicTo) throws Exception { private Pair<String, String> getTargetSwitch(NicTO nicTo) throws Exception {
if (nicTo.getType() == Networks.TrafficType.Guest) {
return new Pair<String, String>(_guestTrafficInfo.getVirtualSwitchName(), Vlan.UNTAGGED);
} else if (nicTo.getType() == Networks.TrafficType.Public) {
return new Pair<String, String>(_publicTrafficInfo.getVirtualSwitchName(), Vlan.UNTAGGED);
}
if(nicTo.getName() != null && !nicTo.getName().isEmpty()) { if(nicTo.getName() != null && !nicTo.getName().isEmpty()) {
String[] tokens = nicTo.getName().split(","); String[] tokens = nicTo.getName().split(",");
// Format of network traffic label is <VSWITCH>,<VLANID>,<VSWITCHTYPE> // Format of network traffic label is <VSWITCH>,<VLANID>,<VSWITCHTYPE>
@ -3265,12 +3271,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
} }
} }
if (nicTo.getType() == Networks.TrafficType.Guest) { if (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management) {
return new Pair<String, String>(_guestTrafficInfo.getVirtualSwitchName(), Vlan.UNTAGGED);
} else if (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management) {
return new Pair<String, String>(_privateNetworkVSwitchName, Vlan.UNTAGGED); return new Pair<String, String>(_privateNetworkVSwitchName, Vlan.UNTAGGED);
} else if (nicTo.getType() == Networks.TrafficType.Public) {
return new Pair<String, String>(_publicTrafficInfo.getVirtualSwitchName(), Vlan.UNTAGGED);
} else if (nicTo.getType() == Networks.TrafficType.Storage) { } else if (nicTo.getType() == Networks.TrafficType.Storage) {
return new Pair<String, String>(_privateNetworkVSwitchName, Vlan.UNTAGGED); return new Pair<String, String>(_privateNetworkVSwitchName, Vlan.UNTAGGED);
} else if (nicTo.getType() == Networks.TrafficType.Vpn) { } else if (nicTo.getType() == Networks.TrafficType.Vpn) {