CLOUDSTACK-1448 Failed to start VM with standard vSwitch on VMware
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6a46656c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6a46656c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6a46656c Branch: refs/heads/ui-multiple-nics Commit: 6a46656c7238b12bd7fdea9848524b0a7e08c903 Parents: 9446eba Author: Mice Xia <[email protected]> Authored: Thu Feb 28 16:30:10 2013 +0800 Committer: Mice Xia <[email protected]> Committed: Thu Feb 28 16:31:06 2013 +0800 ---------------------------------------------------------------------- .../hypervisor/vmware/VmwareServerDiscoverer.java | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a46656c/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java index d7c237d..90fe461 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java @@ -169,7 +169,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements paramGuestVswitchName = _urlParams.get(ApiConstants.VSWITCH_NAME_GUEST_TRAFFIC); paramPublicVswitchType = _urlParams.get(ApiConstants.VSWITCH_TYPE_PUBLIC_TRAFFIC); paramPublicVswitchName = _urlParams.get(ApiConstants.VSWITCH_NAME_PUBLIC_TRAFFIC); - defaultVirtualSwitchType = getDefaultVirtualSwitchType(nexusDVS); + defaultVirtualSwitchType = getDefaultVirtualSwitchType(); } // Get zone wide traffic labels for Guest traffic and Public traffic guestTrafficLabel = _netmgr.getDefaultGuestTrafficLabel(dcId, HypervisorType.VMware); @@ -591,7 +591,7 @@ public class VmwareServerDiscoverer extends DiscovererBase implements String guestTrafficLabel = _netmgr.getDefaultGuestTrafficLabel(host.getDataCenterId(), HypervisorType.VMware); String publicTrafficLabel = _netmgr.getDefaultPublicTrafficLabel(host.getDataCenterId(), HypervisorType.VMware); _readGlobalConfigParameters(); - VirtualSwitchType defaultVirtualSwitchType = getDefaultVirtualSwitchType(nexusDVS); + VirtualSwitchType defaultVirtualSwitchType = getDefaultVirtualSwitchType(); params.put("guestTrafficInfo", getTrafficInfo(TrafficType.Guest, guestTrafficLabel, clusterDetails, defaultVirtualSwitchType)); params.put("publicTrafficInfo", getTrafficInfo(TrafficType.Public, publicTrafficLabel, clusterDetails, defaultVirtualSwitchType)); @@ -599,8 +599,13 @@ public class VmwareServerDiscoverer extends DiscovererBase implements return params; } - private VirtualSwitchType getDefaultVirtualSwitchType(boolean nexusDVS) { - return nexusDVS ? VirtualSwitchType.NexusDistributedVirtualSwitch : VirtualSwitchType.VMwareDistributedVirtualSwitch; + private VirtualSwitchType getDefaultVirtualSwitchType() { + if (nexusDVS) + return VirtualSwitchType.NexusDistributedVirtualSwitch; + else if(useDVS) + return VirtualSwitchType.VMwareDistributedVirtualSwitch; + else + return VirtualSwitchType.StandardVirtualSwitch; } @Override
