Merge branch '4.20'

Author: sureshanaparti

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

@@ -254,6 +254,15 @@ public LibvirtVMDef.InterfaceDef plug(NicTO nic, String guestOsType, String nicA
             intf.defBridgeNet(_bridges.get("private"), null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
         } else if (nic.getType() == Networks.TrafficType.Storage) {
             String storageBrName = nic.getName() == null ? _bridges.get("private") : nic.getName();
+            if (nic.getBroadcastType() == Networks.BroadcastDomainType.Storage) {
+                vNetId = Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
+                protocol = Networks.BroadcastDomainType.Vlan.scheme();
+            }
+            if (isValidProtocolAndVnetId(vNetId, protocol))  {
+                logger.debug(String.format("creating a vNet dev and bridge for %s traffic per traffic label %s",
+                        Networks.TrafficType.Storage.name(), trafficLabel));
+                storageBrName = createVnetBr(vNetId, storageBrName, protocol);
+            }
             intf.defBridgeNet(storageBrName, null, nic.getMac(), getGuestNicModel(guestOsType, nicAdapter));
         }
         if (nic.getPxeDisable()) {

ui/src/views/compute/CreateAutoScaleVmGroup.vue

@@ -737,7 +737,7 @@
                     {{ $t('label.isadvanced') }}
                     <a-switch v-model:checked="showDetails" style="margin-left: 10px"/>
                   </span>
-                  <div style="margin-top: 15px" v-show="showDetails">
+                  <div style="margin-top: 15px" v-if="showDetails">
                     <a-form-item :label="$t('label.sshkeypairs')">
                       <ssh-key-pair-selection
                         :items="options.sshKeyPairs"

ui/src/views/infra/network/IpRangesTabStorage.vue

@@ -166,7 +166,7 @@ export default {
         },
         {
           title: this.$t('label.vlan'),
-          dataIndex: 'vlanid'
+          dataIndex: 'vlan'
         },
         {
           title: this.$t('label.startip'),