cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seb...@apache.org
Subject git commit: updated refs/heads/4.3 to f16fbc3
Date Tue, 17 Jun 2014 13:33:50 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 08e571eef -> f16fbc3c5


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/f16fbc3c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f16fbc3c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f16fbc3c

Branch: refs/heads/4.3
Commit: f16fbc3c52b602828ed0ded0532abb0f90359d96
Parents: 08e571e
Author: ilya <ilya@apache.org>
Authored: Thu Apr 3 06:46:59 2014 +0000
Committer: Sebastien Goasguen <runseb@gmail.com>
Committed: Tue Jun 17 15:33:29 2014 +0200

----------------------------------------------------------------------
 .../cloud/hypervisor/vmware/resource/VmwareResource.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f16fbc3c/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);
     }
 


Mime
View raw message