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:00:59 UTC
[1/2] git commit: updated refs/heads/4.3.0-forward to 825929d
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 <ro...@ilya.apache.org>
Authored: Thu Apr 3 05:26:06 2014 +0000
Committer: root <ro...@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 ");
Re: [1/2] git commit: updated refs/heads/4.3.0-forward to 825929d
Posted by Daan Hoogland <da...@gmail.com>.
never mind my two mails ago
On Wed, May 28, 2014 at 8:00 AM, <il...@apache.org> wrote:
...
> -<<<<<<< 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
--
Daan
[2/2] git commit: updated refs/heads/4.3.0-forward to 825929d
Posted by il...@apache.org.
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);
}