Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EBF06D9D4 for ; Tue, 5 Mar 2013 01:33:17 +0000 (UTC) Received: (qmail 89732 invoked by uid 500); 5 Mar 2013 01:33:15 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 89649 invoked by uid 500); 5 Mar 2013 01:33:15 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 89463 invoked by uid 99); 5 Mar 2013 01:33:15 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 01:33:15 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 27E9E314B73; Tue, 5 Mar 2013 01:33:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [15/25] git commit: refs/heads/vim51_win8 - Fixing mapping of virtual switch types. Message-Id: <20130305013315.27E9E314B73@tyr.zones.apache.org> Date: Tue, 5 Mar 2013 01:33:15 +0000 (UTC) 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 Authored: Mon Mar 4 16:25:24 2013 +0530 Committer: Sateesh Chodapuneedi 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; }