Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3462A10FB0 for ; Wed, 28 May 2014 04:12:09 +0000 (UTC) Received: (qmail 56218 invoked by uid 500); 28 May 2014 04:12:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 56056 invoked by uid 500); 28 May 2014 04:12:08 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 56046 invoked by uid 99); 28 May 2014 04:12:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 May 2014 04:12:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 690A094BABF; Wed, 28 May 2014 04:12:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ilya@apache.org To: commits@cloudstack.apache.org Date: Wed, 28 May 2014 04:12:09 -0000 Message-Id: <36c1eff3ac1943e49b25f7c999ac64f6@git.apache.org> In-Reply-To: <1afaf6dbb15948f3b6e65ec61ec04169@git.apache.org> References: <1afaf6dbb15948f3b6e65ec61ec04169@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/4.3.0-forward to f0a98ba 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 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 Authored: Fri May 2 18:25:29 2014 +0530 Committer: root 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(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 ");