You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/05/02 15:06:57 UTC
git commit: updated refs/heads/4.4-forward to ce7a689
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 362f89b9e -> ce7a689ae
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 <sa...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ce7a689a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ce7a689a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ce7a689a
Branch: refs/heads/4.4-forward
Commit: ce7a689ae16f5a28b3ad9ff50a7bb19af31df4cf
Parents: 362f89b
Author: Sateesh Chodapuneedi <sa...@apache.org>
Authored: Fri May 2 18:25:29 2014 +0530
Committer: Sateesh Chodapuneedi <sa...@apache.org>
Committed: Fri May 2 18:36:09 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/ce7a689a/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;
}