cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject [1/2] git commit: updated refs/heads/4.3.0-forward to 825929d
Date Wed, 28 May 2014 06:00:59 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.3.0-forward f0a98baa0 -> 825929d7e


Revert "CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage
traffic"

This reverts commit f0a98baa0c3258954a4fc4424d8c2f22a50d9ed4.


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

Branch: refs/heads/4.3.0-forward
Commit: 869b2535b72af3c0f6d77425f1416d245041aa3a
Parents: f0a98ba
Author: root <root@ilya.apache.org>
Authored: Thu Apr 3 05:26:06 2014 +0000
Committer: root <root@ilya.apache.org>
Committed: Thu Apr 3 05:26:06 2014 +0000

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/869b2535/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 3ade683..be87f12 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,9 +3749,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource,
Vmwa
             }
         }
 
-            if (switchName == null
-			&& (nicTo.getType() == Networks.TrafficType.Control || nicTo.getType() == Networks.TrafficType.Management
|| nicTo.getType() == Networks.TrafficType.Storage)) {
-		switchName = _privateNetworkVSwitchName;
+        if (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);
@@ -3831,14 +3830,7 @@ 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