getting the vlanid from the /proc/net/vlan/<pif> file instead of the bridge name

Author: abh1sar

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -1771,6 +1771,20 @@ private String matchPifFileInDirectory(final String bridgeName) {
         return "";
     }
 
+    public Integer getVlanIdForBridge(final String bridge) {
+        String pif = matchPifFileInDirectory(bridge);
+        final File vlanfile = new File("/proc/net/vlan/" + pif);
+        if (vlanfile.isFile()) {
+            String vlan = Script.runSimpleBashScript("awk '/VID:/ {print $3}' /proc/net/vlan/" + pif);
+            try {
+                return Integer.parseInt(vlan);
+            } catch (final NumberFormatException e) {
+                return null;
+            }
+        }
+        return null;
+    }
+
     static String [] ifNamePatterns = {
             "^eth",
             "^bond",

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java

@@ -240,12 +240,6 @@ public boolean parseDomainXML(String domXML) {
                 } else if (type.equalsIgnoreCase("bridge")) {
                     String bridge = getAttrValue("source", "bridge", nic);
                     def.defBridgeNet(bridge, dev, mac, NicModel.valueOf(model.toUpperCase()), networkRateKBps);
-                    if (StringUtils.isNotBlank(bridge)) {
-                        Integer vlanId = extractVlanFromBridgeName(bridge);
-                        if (vlanId != null) {
-                            def.setVlanTag(vlanId);
-                        }
-                    }
                 } else if (type.equalsIgnoreCase("ethernet")) {
                     String scriptPath = getAttrValue("script", "path", nic);
                     def.defEthernet(dev, mac, NicModel.valueOf(model.toUpperCase()), scriptPath, networkRateKBps);
@@ -573,22 +567,4 @@ private void extractCpuModeDef(final Element rootElement){
             }
         }
     }
-
-    private Integer extractVlanFromBridgeName(String bridge) {
-        if (!bridge.startsWith("br")) {
-            return null;
-        }
-        String[] splitByDash = bridge.split("-");
-        if (splitByDash.length < 2) {
-            return null;
-        }
-        try {
-            Integer vlanId = Integer.parseInt(splitByDash[splitByDash.length - 1]);
-            if (vlanId >=1 && vlanId <= 4094) {
-                return vlanId;
-            }
-        } catch (NumberFormatException e) {
-        }
-        return null;
-    }
 }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java

@@ -134,7 +134,7 @@ private UnmanagedInstanceTO getUnmanagedInstance(LibvirtComputingResource libvir
             }
             instance.setPowerState(getPowerState(libvirtComputingResource.getVmState(conn,domain.getName())));
             instance.setMemory((int) LibvirtComputingResource.getDomainMemory(domain) / 1024);
-            instance.setNics(getUnmanagedInstanceNics(parser.getInterfaces()));
+            instance.setNics(getUnmanagedInstanceNics(libvirtComputingResource, parser.getInterfaces()));
             instance.setDisks(getUnmanagedInstanceDisks(parser.getDisks(),libvirtComputingResource, conn, domain.getName()));
             instance.setVncPassword(getFormattedVncPassword(parser.getVncPasswd()));
 
@@ -165,7 +165,7 @@ private UnmanagedInstanceTO.PowerState getPowerState(VirtualMachine.PowerState v
         }
     }
 
-    private List<UnmanagedInstanceTO.Nic> getUnmanagedInstanceNics(List<LibvirtVMDef.InterfaceDef> interfaces) {
+    private List<UnmanagedInstanceTO.Nic> getUnmanagedInstanceNics(LibvirtComputingResource libvirtComputingResource, List<LibvirtVMDef.InterfaceDef> interfaces) {
         final ArrayList<UnmanagedInstanceTO.Nic> nics = new ArrayList<>(interfaces.size());
         int counter = 0;
         for (LibvirtVMDef.InterfaceDef interfaceDef : interfaces) {
@@ -176,6 +176,9 @@ private List<UnmanagedInstanceTO.Nic> getUnmanagedInstanceNics(List<LibvirtVMDef
             nic.setNetwork(interfaceDef.getDevName());
             nic.setPciSlot(interfaceDef.getSlot().toString());
             nic.setVlan(interfaceDef.getVlanTag());
+            if (nic.getVlan() == -1 && interfaceDef.getNetType() == LibvirtVMDef.InterfaceDef.GuestNetType.BRIDGE) {
+                nic.setVlan(libvirtComputingResource.getVlanIdForBridge(interfaceDef.getBrName()));
+            }
             nics.add(nic);
         }
         return nics;

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtReplugNicCommandWrapperTest.java

@@ -252,9 +252,6 @@ public void testReplugNic() throws LibvirtException {
                         + "<inbound average='25600' peak='25600'/>\n"
                         + "<outbound average='25600' peak='25600'/>\n"
                         + "</bandwidth>\n"
-                        + "<vlan trunk='no'>\n"
-                        + "<tag id='234'/>\n"
-                        + "</vlan>"
                         + "<link state='up'/>\n"
                         + "</interface>\n";
         final String expectedAttachXml =