apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

if guest network type is vlan://untagged, and traffic label is used, kvm agent needs to honor traffic label

Browse Source
This commit is contained in:
Edison Su 2014-10-09 16:43:00 -07:00
parent 6a5e4306f2
commit 5ff1ece2be
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
View File

@ -125,7 +125,13 @@ public class BridgeVifDriver extends VifDriverBase {
intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps); intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter), networkRateKBps);
} }
} else { } 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) { } else if (nic.getType() == Networks.TrafficType.Control) {
/* Make sure the network is still there */ /* Make sure the network is still there */