List default network offerings when multiple physical networks for guest traffic type exists (#10222)

Author: Pearl1594

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -6955,10 +6955,6 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
             sc.addAnd("id", SearchCriteria.Op.EQ, id);
         }
 
-        if (tags != null) {
-            sc.addAnd("tags", SearchCriteria.Op.EQ, tags);
-        }
-
         if (isTagged != null) {
             if (isTagged) {
                 sc.addAnd("tags", SearchCriteria.Op.NNULL);
@@ -6967,6 +6963,17 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
             }
         }
 
+        if (tags != null) {
+            if (GuestType.Shared.name().equalsIgnoreCase(guestIpType)) {
+                SearchCriteria<NetworkOfferingJoinVO> tagsSc = networkOfferingJoinDao.createSearchCriteria();
+                tagsSc.addAnd("tags", SearchCriteria.Op.EQ, tags);
+                tagsSc.addOr("isDefault", SearchCriteria.Op.EQ, true);
+                sc.addAnd("tags", SearchCriteria.Op.SC, tagsSc);
+            } else {
+                sc.addAnd("tags", SearchCriteria.Op.EQ, tags);
+            }
+        }
+
         if (zoneId != null) {
             SearchBuilder<NetworkOfferingJoinVO> sb = networkOfferingJoinDao.createSearchBuilder();
             sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.FIND_IN_SET);
@@ -7027,7 +7034,7 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
                 boolean addOffering = true;
                 List<Service> checkForProviders = new ArrayList<Service>();
 
-                if (checkForTags && ! checkNetworkOfferingTags(pNtwkTags, allowNullTag, offering.getTags())) {
+                if (checkForTags && !checkNetworkOfferingTags(pNtwkTags, allowNullTag, offering.getTags())) {
                     continue;
                 }