Repository: cloudstack Updated Branches: refs/heads/4.4 16342f8a8 -> 47f5d2862
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 <sate...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/47f5d286 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/47f5d286 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/47f5d286 Branch: refs/heads/4.4 Commit: 47f5d2862ac827a3722680fe4f8f1f576776f81b Parents: 16342f8 Author: Sateesh Chodapuneedi <sate...@apache.org> Authored: Fri May 2 18:25:29 2014 +0530 Committer: Daan Hoogland <d...@onecht.net> Committed: Fri May 2 19:02:45 2014 +0200 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/47f5d286/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java ---------------------------------------------------------------------- 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 945773e..f131245 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; }
