apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-3905 [VMWARE]Can not add Standard/DVSwitch when Nexus global config is set to true

Browse Source 
Make VSM specific input paramters optional while adding VMware cluster where no traffic chosen to use Nexus 1000v dvSwitch when cloud level vSwitch is Nexus 1000v.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
This commit is contained in:
Sateesh Chodapuneedi 2013-08-12 22:41:38 +05:30
parent 5acbaebbf2
commit 9e3aa37a8d
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
View File

@ -291,7 +291,12 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
s_logger.info("Detected private network label : " + privateTrafficLabel);
}
Pair<Boolean, Long> vsmInfo = new Pair<Boolean, Long>(false, 0L);
if (nexusDVS) {
if (nexusDVS &&
(guestTrafficLabelObj.getVirtualSwitchType() == VirtualSwitchType.NexusDistributedVirtualSwitch) ||
((zoneType == NetworkType.Advanced) && (publicTrafficLabelObj.getVirtualSwitchType() == VirtualSwitchType.NexusDistributedVirtualSwitch))) {
// Expect Cisco Nexus VSM details only if following 2 condition met
// 1) The global config parameter vmware.use.nexus.vswitch
// 2) Atleast 1 traffic type uses Nexus distributed virtual switch as backend.
if (zoneType != NetworkType.Basic) {
publicTrafficLabel = _netmgr.getDefaultPublicTrafficLabel(dcId, HypervisorType.VMware);
if (publicTrafficLabel != null) {
@ -650,33 +655,24 @@ public class VmwareServerDiscoverer extends DiscovererBase implements
throw e;
}
if (defaultVirtualSwitchType.equals(VirtualSwitchType.StandardVirtualSwitch)|| (vSwitchType == null && vSwitchName == null)) {
// Case of no cluster level override configuration defined.
// Depend only on zone wide traffic label
// If global param for dvSwitch is false return default traffic info object with vmware standard vswitch
return trafficLabelObj;
} else {
// Need to persist cluster level override configuration to db
clusterDetails = _clusterDetailsDao.findDetails(clusterId);
}
clusterDetails = _clusterDetailsDao.findDetails(clusterId);
if (vSwitchName != null) {
trafficLabelObj.setVirtualSwitchName(vSwitchName);
if (trafficType == TrafficType.Guest) {
clusterDetails.put(ApiConstants.VSWITCH_NAME_GUEST_TRAFFIC, vSwitchName);
} else {
clusterDetails.put(ApiConstants.VSWITCH_NAME_PUBLIC_TRAFFIC, vSwitchName);
}
}
if (trafficType == TrafficType.Guest) {
clusterDetails.put(ApiConstants.VSWITCH_NAME_GUEST_TRAFFIC, trafficLabelObj.getVirtualSwitchName());
} else {
clusterDetails.put(ApiConstants.VSWITCH_NAME_PUBLIC_TRAFFIC, trafficLabelObj.getVirtualSwitchName());
}
if (vSwitchType != null) {
validateVswitchType(vSwitchType);
trafficLabelObj.setVirtualSwitchType(VirtualSwitchType.getType(vSwitchType));
if (trafficType == TrafficType.Guest) {
clusterDetails.put(ApiConstants.VSWITCH_TYPE_GUEST_TRAFFIC, vSwitchType);
} else {
clusterDetails.put(ApiConstants.VSWITCH_TYPE_PUBLIC_TRAFFIC, vSwitchType);
}
}
if (trafficType == TrafficType.Guest) {
clusterDetails.put(ApiConstants.VSWITCH_TYPE_GUEST_TRAFFIC, trafficLabelObj.getVirtualSwitchType().toString());
} else {
clusterDetails.put(ApiConstants.VSWITCH_TYPE_PUBLIC_TRAFFIC, trafficLabelObj.getVirtualSwitchType().toString());
}
// Save cluster level override configuration to cluster details

16
plugins/hypervisors/vmware/src/com/cloud/network/VmwareTrafficLabel.java
View File

@ -58,15 +58,15 @@ public class VmwareTrafficLabel implements TrafficLabel {
}
private void _parseLabel(String networkLabel, VirtualSwitchType defVswitchType) {
// Set defaults for label in case of distributed vSwitch
if (defVswitchType.equals(VirtualSwitchType.VMwareDistributedVirtualSwitch)) {
_vSwitchName = DEFAULT_DVSWITCH_NAME;
_vSwitchType = VirtualSwitchType.VMwareDistributedVirtualSwitch;
} else if (defVswitchType.equals(VirtualSwitchType.NexusDistributedVirtualSwitch)) {
_vSwitchName = DEFAULT_NDVSWITCH_NAME;
_vSwitchType = VirtualSwitchType.NexusDistributedVirtualSwitch;
}
if (networkLabel == null || networkLabel.isEmpty()) {
// Set defaults for label in case of distributed vSwitch
if (defVswitchType.equals(VirtualSwitchType.VMwareDistributedVirtualSwitch)) {
_vSwitchName = DEFAULT_DVSWITCH_NAME;
_vSwitchType = VirtualSwitchType.VMwareDistributedVirtualSwitch;
} else if (defVswitchType.equals(VirtualSwitchType.NexusDistributedVirtualSwitch)) {
_vSwitchName = DEFAULT_NDVSWITCH_NAME;
_vSwitchType = VirtualSwitchType.NexusDistributedVirtualSwitch;
}
return;
}
String[] tokens = networkLabel.split(",");