Skip to content

Commit dfb59cd

Browse files
committed
CLOUDSTACK-6464: if guest network type is vlan://untagged, and traffic label is used, kvm agent needs to honor traffic label
1 parent 5e80e5d commit dfb59cd

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,13 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType) throws Inte
112112
intf.defBridgeNet(brName, null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps);
113113
}
114114
} else {
115-
intf.defBridgeNet(_bridges.get("guest"), null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps);
115+
String brname = "";
116+
if (trafficLabel != null && !trafficLabel.isEmpty()) {
117+
brname = trafficLabel;
118+
} else {
119+
brname = _bridges.get("guest");
120+
}
121+
intf.defBridgeNet(brname, null, nic.getMac(), getGuestNicModel(guestOsType), networkRateKBps);
116122
}
117123
} else if (nic.getType() == Networks.TrafficType.Control) {
118124
/* Make sure the network is still there */

0 commit comments

Comments
 (0)