Get vlan from bridge name while importing kvm instances

Author: abh1sar

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

@@ -240,6 +240,12 @@ 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);
@@ -567,4 +573,22 @@ 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;
+    }
 }

ui/src/views/compute/wizard/MultiNetworkSelection.vue

@@ -47,7 +47,7 @@
           <a-select
             style="width: 100%"
             v-if="validNetworks[record.id] && validNetworks[record.id].length > 0"
-            :defaultValue="validNetworks[record.id][0].id"
+            :defaultValue="getDefaultNetwork(record)"
             @change="val => handleNetworkChange(record, val)"
             showSearch
             optionFilterProp="label"
@@ -280,6 +280,18 @@ export default {
       }
       this.sendValuesTimed()
     },
+    getDefaultNetwork (record) {
+      console.log('getDefaultNetwork', record, this.values, this.validNetworks)
+      if (record.vlanid) {
+        const matched = this.validNetworks[record.id].filter(x => Number(x.vlan) === record.vlanid)
+        console.log('matched', matched)
+        if (matched.length > 0) {
+          this.handleNetworkChange(record, matched[0].id)
+          return matched[0].id
+        }
+      }
+      return this.validNetworks[record.id][0].id
+    },
     sendValuesTimed () {
       clearTimeout(this.sendValuesTimer)
       this.sendValuesTimer = setTimeout(() => {