You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/06/03 22:35:43 UTC

git commit: updated refs/heads/4.4-forward to dfb59cd

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 5e80e5d33 -> dfb59cd6c


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/dfb59cd6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dfb59cd6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dfb59cd6

Branch: refs/heads/4.4-forward
Commit: dfb59cd6cc0292a88cb619e53f34cdb713879ffd
Parents: 5e80e5d
Author: Edison Su <su...@gmail.com>
Authored: Tue Jun 3 13:31:29 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jun 3 13:35:10 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/dfb59cd6/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 */