cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke4...@apache.org
Subject [46/50] [abbrv] git commit: updated refs/heads/4.5 to 50ee981
Date Mon, 13 Oct 2014 04:42:03 GMT
if guest network type is vlan://untagged, and traffic label is used, kvm agent needs to honor
traffic label

(cherry picked from commit 5ff1ece2bec75ece99df748e9af2abc0a499a30b)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e9d3b62
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e9d3b62
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e9d3b62

Branch: refs/heads/4.5
Commit: 6e9d3b62b36509b917592b6ae575e87f16d8c50e
Parents: 52c6c90
Author: Edison Su <sudison@gmail.com>
Authored: Thu Oct 9 16:43:00 2014 -0700
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:38:57 2014 -0400

----------------------------------------------------------------------
 .../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/6e9d3b62/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 */


Mime
View raw message