etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Commit for https://reviews.apache.org/r/6928/

This commit is contained in:
Kelven Yang 2012-09-20 15:06:02 -07:00
parent edc6b4c6da
commit 4c5f41bfeb
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
View File

@ -230,25 +230,31 @@ public class VmwareManagerImpl implements VmwareManager, VmwareStorageMount, Lis
_privateNetworkVSwitchName = configDao.getValue(Config.VmwarePrivateNetworkVSwitch.key()); _privateNetworkVSwitchName = configDao.getValue(Config.VmwarePrivateNetworkVSwitch.key());
if (_privateNetworkVSwitchName == null) { if (_privateNetworkVSwitchName == null) {
_privateNetworkVSwitchName = "vSwitch0"; if (_nexusVSwitchActive) {
} else { _privateNetworkVSwitchName = "privateEthernetPortProfile";
_privateNetworkVSwitchName = "privateEthernetPortProfile"; } else {
_privateNetworkVSwitchName = "vSwitch0";
}
} }
_publicNetworkVSwitchName = configDao.getValue(Config.VmwarePublicNetworkVSwitch.key()); _publicNetworkVSwitchName = configDao.getValue(Config.VmwarePublicNetworkVSwitch.key());
if (_publicNetworkVSwitchName == null) { if (_publicNetworkVSwitchName == null) {
_publicNetworkVSwitchName = "vSwitch0"; if (_nexusVSwitchActive) {
} else { _publicNetworkVSwitchName = "publicEthernetPortProfile";
_publicNetworkVSwitchName = "publicEthernetPortProfile"; } else {
_publicNetworkVSwitchName = "vSwitch0";
}
} }
_guestNetworkVSwitchName = configDao.getValue(Config.VmwareGuestNetworkVSwitch.key()); _guestNetworkVSwitchName = configDao.getValue(Config.VmwareGuestNetworkVSwitch.key());
if (_guestNetworkVSwitchName == null) { if (_guestNetworkVSwitchName == null) {
_guestNetworkVSwitchName = "vSwitch0"; if (_nexusVSwitchActive) {
} else { _guestNetworkVSwitchName = "guestEthernetPortProfile";
_guestNetworkVSwitchName = "guestEthernetPortProfile"; } else {
_guestNetworkVSwitchName = "vSwitch0";
}
} }
_serviceConsoleName = configDao.getValue(Config.VmwareServiceConsole.key()); _serviceConsoleName = configDao.getValue(Config.VmwareServiceConsole.key());