Updated Branches: refs/heads/master edc6b4c6d -> 6e767a349
Commit for https://reviews.apache.org/r/6928/ Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4c5f41bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4c5f41bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4c5f41bf Branch: refs/heads/master Commit: 4c5f41bfebec43805462d927246c01721eddd2de Parents: edc6b4c Author: Kelven Yang <[email protected]> Authored: Thu Sep 20 15:06:02 2012 -0700 Committer: Kelven Yang <[email protected]> Committed: Thu Sep 20 15:42:06 2012 -0700 ---------------------------------------------------------------------- .../vmware/manager/VmwareManagerImpl.java | 24 +++++++++----- 1 files changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4c5f41bf/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java ---------------------------------------------------------------------- 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 205fb26..ce1af26 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());
