Fixing mapping of virtual switch types.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8366a156 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8366a156 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8366a156 Branch: refs/heads/vim51_win8 Commit: 8366a15659f44539aea0e12a8e5e485c14be0d80 Parents: 6b257bf Author: Sateesh Chodapuneedi <[email protected]> Authored: Mon Mar 4 16:25:24 2013 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Mon Mar 4 16:25:24 2013 +0530 ---------------------------------------------------------------------- .../hypervisor/vmware/mo/VirtualSwitchType.java | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8366a156/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java ---------------------------------------------------------------------- diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java index bcfc64b..d67128f 100755 --- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java +++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java @@ -29,14 +29,12 @@ public enum VirtualSwitchType { public final static String nexusDistributedVirtualSwitch = "nexusdvs"; public static VirtualSwitchType getType(String vSwitchType) { - if (vSwitchType == null) { + if (vSwitchType == null || vSwitchType.equalsIgnoreCase(vmwareStandardVirtualSwitch)) { return VirtualSwitchType.StandardVirtualSwitch; - } else if (vSwitchType.equalsIgnoreCase(vmwareStandardVirtualSwitch)) { - return VirtualSwitchType.VMwareDistributedVirtualSwitch; } else if (vSwitchType.equalsIgnoreCase(vmwareDistributedVirtualSwitch)) { - return VirtualSwitchType.NexusDistributedVirtualSwitch; + return VirtualSwitchType.VMwareDistributedVirtualSwitch; } else if (vSwitchType.equalsIgnoreCase(nexusDistributedVirtualSwitch)) { - return VirtualSwitchType.StandardVirtualSwitch; + return VirtualSwitchType.NexusDistributedVirtualSwitch; } return VirtualSwitchType.None; }
