Merge remote-tracking branch 'origin/4.22'

Author: Pearl1594

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

@@ -201,9 +201,16 @@ protected boolean isValidProtocolAndVnetId(final String vNetId, final String pro
 
     protected String createStorageVnetBridgeIfNeeded(NicTO nic, String trafficLabel,
                  String storageBrName) throws InternalErrorException {
-        if (!Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) || nic.getBroadcastUri() == null) {
+        if (nic.getBroadcastUri() == null) {
             return storageBrName;
         }
+
+        boolean isStorageBroadcast = Networks.BroadcastDomainType.Storage.equals(nic.getBroadcastType()) ||
+                Networks.BroadcastDomainType.Storage.equals(Networks.BroadcastDomainType.getSchemeValue(nic.getBroadcastUri()));
+        if (!isStorageBroadcast) {
+            return storageBrName;
+        }
+
         String vNetId = Networks.BroadcastDomainType.getValue(nic.getBroadcastUri());
         String protocol = Networks.BroadcastDomainType.Vlan.scheme();
         if (!isValidProtocolAndVnetId(vNetId, protocol))  {