You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by il...@apache.org on 2014/05/28 08:01:00 UTC
[2/2] git commit: updated refs/heads/4.3.0-forward to 825929d
CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage traffic
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/825929d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/825929d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/825929d7
Branch: refs/heads/4.3.0-forward
Commit: 825929d7e98cbd680c57ff424f987bbb0b0aff62
Parents: 869b253
Author: ilya <il...@apache.org>
Authored: Thu Apr 3 06:46:59 2014 +0000
Committer: ilya <il...@apache.org>
Committed: Thu Apr 3 06:46:59 2014 +0000
----------------------------------------------------------------------
.../cloud/hypervisor/vmware/resource/VmwareResource.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/825929d7/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 be87f12..7f35eb7 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
@@ -3749,10 +3749,11 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
}
}
- if (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage) {
- switchName = _privateNetworkVSwitchName;
- }
-
+ if (switchName == null
+ && (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage)) {
+ switchName = _privateNetworkVSwitchName;
+ }
+
return new Ternary<String,String,String>(switchName, switchType.toString(), vlanToken);
}