From 4c5f41bfebec43805462d927246c01721eddd2de Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven.yang@citrix.com>
Date: Thu, 20 Sep 2012 15:06:02 -0700
Subject: [PATCH] Commit for https://reviews.apache.org/r/6928/

---
 .../vmware/manager/VmwareManagerImpl.java     | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 205fb26f09d..ce1af262cf7 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -230,25 +230,31 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
         _privateNetworkVSwitchName = configDao.getValue(Config.VmwarePrivateNetworkVSwitch.key());
 
         if (_privateNetworkVSwitchName == null) {
-            _privateNetworkVSwitchName = "vSwitch0";
-        } else {
-            _privateNetworkVSwitchName = "privateEthernetPortProfile";
+            if (_nexusVSwitchActive) {
+                _privateNetworkVSwitchName = "privateEthernetPortProfile";
+            } else {
+                _privateNetworkVSwitchName = "vSwitch0";
+            }
         }
 
         _publicNetworkVSwitchName = configDao.getValue(Config.VmwarePublicNetworkVSwitch.key());
 
         if (_publicNetworkVSwitchName == null) {
-            _publicNetworkVSwitchName = "vSwitch0";
-        } else {
-            _publicNetworkVSwitchName = "publicEthernetPortProfile";
+            if (_nexusVSwitchActive) {
+                _publicNetworkVSwitchName = "publicEthernetPortProfile";
+            } else {
+                _publicNetworkVSwitchName = "vSwitch0";
+            }
         }
 
         _guestNetworkVSwitchName = configDao.getValue(Config.VmwareGuestNetworkVSwitch.key());
 
         if (_guestNetworkVSwitchName == null) {
-            _guestNetworkVSwitchName = "vSwitch0";
-        } else {
-            _guestNetworkVSwitchName = "guestEthernetPortProfile";
+            if (_nexusVSwitchActive) {
+                _guestNetworkVSwitchName = "guestEthernetPortProfile";
+            } else {
+                _guestNetworkVSwitchName = "vSwitch0";
+            }
         }
 
         _serviceConsoleName = configDao.getValue(Config.VmwareServiceConsole.key());