Repository: cloudstack Updated Branches: refs/heads/master 82c082792 -> 5bc72ea25
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5bc72ea2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5bc72ea2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5bc72ea2 Branch: refs/heads/master Commit: 5bc72ea25000456b4a479baac8f9e0690794c0d2 Parents: 82c0827 Author: Sateesh Chodapuneedi <[email protected]> Authored: Fri May 2 18:25:29 2014 +0530 Committer: Sateesh Chodapuneedi <[email protected]> Committed: Fri May 2 18:25:29 2014 +0530 ---------------------------------------------------------------------- .../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/5bc72ea2/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 0024b44..30a9bf0 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 @@ -2408,7 +2408,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; }
