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

Author: sudison

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

@@ -125,7 +125,13 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA
                         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 */