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 EA561110A5 for ; Wed, 4 Jun 2014 23:58:19 +0000 (UTC) Received: (qmail 86432 invoked by uid 500); 4 Jun 2014 23:50:15 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 86397 invoked by uid 500); 4 Jun 2014 23:50:15 -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 86040 invoked by uid 99); 4 Jun 2014 23:50:14 -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, 04 Jun 2014 23:50:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C60DE94A1B6; Wed, 4 Jun 2014 23:50:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Date: Wed, 04 Jun 2014 23:51:01 -0000 Message-Id: In-Reply-To: <3ba4a4995242436aa247ec6cec97c4e5@git.apache.org> References: <3ba4a4995242436aa247ec6cec97c4e5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [49/50] git commit: updated refs/heads/4.3 to f304df0 CLOUDSTACK-6464: if guest network type is vlan://untagged, and traffic label is used, kvm agent needs to honor traffic label Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/15385948 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/15385948 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/15385948 Branch: refs/heads/4.3 Commit: 15385948dcdf4c69136e99bf3c602f95fd018f39 Parents: 7e2c9f2 Author: Edison Su Authored: Tue Jun 3 13:31:29 2014 -0700 Committer: Edison Su Committed: Tue Jun 3 13:31:29 2014 -0700 ---------------------------------------------------------------------- .../com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/15385948/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index 2703ddc..932447c 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -23,7 +23,6 @@ import java.io.File; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.net.URI; import javax.naming.ConfigurationException; @@ -117,7 +116,13 @@ public class BridgeVifDriver extends VifDriverBase { intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps); } } else { - intf.defBridgeNet(_bridges.get("guest"), null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps); + String brname = ""; + if (trafficLabel != null && !trafficLabel.isEmpty()) { + brname = trafficLabel; + } else { + brname = _bridges.get("guest"); + } + intf.defBridgeNet(brname, null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps); } } else if (nic.getType() == Networks.TrafficType.Control) { /* Make sure the network is still there */