cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [49/50] git commit: updated refs/heads/4.3 to f304df0
Date Wed, 04 Jun 2014 23:51:01 GMT
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 <sudison@gmail.com>
Authored: Tue Jun 3 13:31:29 2014 -0700
Committer: Edison Su <sudison@gmail.com>
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 */


Mime
View raw message