Repository: cloudstack Updated Branches: refs/heads/master 6a5e4306f -> 5ff1ece2b
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/5ff1ece2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5ff1ece2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5ff1ece2 Branch: refs/heads/master Commit: 5ff1ece2bec75ece99df748e9af2abc0a499a30b Parents: 6a5e430 Author: Edison Su <sudi...@gmail.com> Authored: Thu Oct 9 16:43:00 2014 -0700 Committer: Edison Su <sudi...@gmail.com> Committed: Thu Oct 9 16:43:00 2014 -0700 ---------------------------------------------------------------------- .../com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ff1ece2/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 b6814ba..12eda74 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 @@ -125,7 +125,13 @@ public class BridgeVifDriver extends VifDriverBase { intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps); } } else { - intf.defBridgeNet(_bridges.get("guest"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps); + String brname = ""; + if (trafficLabel != null && !trafficLabel.isEmpty()) { + brname = trafficLabel; + } else { + brname = _bridges.get("guest"); + } + intf.defBridgeNet(brname, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps); } } else if (nic.getType() == Networks.TrafficType.Control) { /* Make sure the network is still there */
