From 8366a15659f44539aea0e12a8e5e485c14be0d80 Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Mon, 4 Mar 2013 16:25:24 +0530 Subject: [PATCH] Fixing mapping of virtual switch types. --- .../com/cloud/hypervisor/vmware/mo/VirtualSwitchType.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 bcfc64b6174..d67128f723e 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; }