You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/06/04 16:49:55 UTC
git commit: updated refs/heads/4.4 to 91391e6
Repository: cloudstack
Updated Branches:
refs/heads/4.4 c6e00c682 -> 91391e677
CLOUDSTACK-6464: if guest network type is vlan://untagged, and traffic label is used, kvm agent needs to honor traffic label
(cherry picked from commit dfb59cd6cc0292a88cb619e53f34cdb713879ffd)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/91391e67
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/91391e67
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/91391e67
Branch: refs/heads/4.4
Commit: 91391e6779bd25b91a3ca4d014656e24592187eb
Parents: c6e00c6
Author: Edison Su <su...@gmail.com>
Authored: Tue Jun 3 13:31:29 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 4 16:49:43 2014 +0200
----------------------------------------------------------------------
.../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/91391e67/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 57b111e..2bab7a1 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
@@ -112,7 +112,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 */