From 47f5d2862ac827a3722680fe4f8f1f576776f81b Mon Sep 17 00:00:00 2001 From: Sateesh Chodapuneedi Date: Fri, 2 May 2014 18:25:29 +0530 Subject: [PATCH] CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage traffic Check if switch name detected from traffic label for management, storage, control traffic is null before falling back to default value. Signed-off-by: Sateesh Chodapuneedi --- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 945773ec667..f131245ea67 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -2409,7 +2409,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } } - if (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage) { + if (switchName == null + && (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage)) { switchName = _privateNetworkVSwitchName; }