cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject [2/2] git commit: updated refs/heads/4.3.0-forward to f0a98ba
Date Wed, 28 May 2014 04:12:09 GMT
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 <sateesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0a98baa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0a98baa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0a98baa

Branch: refs/heads/4.3.0-forward
Commit: f0a98baa0c3258954a4fc4424d8c2f22a50d9ed4
Parents: d7c6e79
Author: Sateesh Chodapuneedi <sateesh@apache.org>
Authored: Fri May 2 18:25:29 2014 +0530
Committer: root <root@devhost1.minigiant.apple.com>
Committed: Thu Apr 3 04:50:58 2014 +0000

----------------------------------------------------------------------
 .../hypervisor/vmware/resource/VmwareResource.java      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f0a98baa/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..3ade683 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,8 +3749,9 @@ 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);
@@ -3830,7 +3831,14 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
                 argsBuf.append(" -u ").append(userpwd.getUsernamePassword());
             }
 
+<<<<<<< HEAD
             try {
+=======
+        if (switchName == null
+                && (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType()
== Networks.TrafficType.Management || nicTo.getType() == Networks.TrafficType.Storage)) {
+            switchName = _privateNetworkVSwitchName;
+        }
+>>>>>>> 5bc72ea... CLOUDSTACK-6317 [VMware] Tagged VLAN support broken
for Management/Control/Storage traffic
 
                 if (s_logger.isDebugEnabled()) {
                     s_logger.debug("Executing /opt/cloud/bin/vpn_lt2p.sh ");


Mime
View raw message