From ae061d805294ab521e2047066205dc7fb9e6ac91 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Mon, 20 Jan 2025 13:47:12 -0500
Subject: [PATCH 1/2] List default network offerings when multiple physical
 networks for guest traffic type exists

---
 .../configuration/ConfigurationManagerImpl.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 9df33b47257f..0f86179045c5 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/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,13 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
             }
         }
 
+        if (tags != null) {
+            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);
+        }
+
         if (zoneId != null) {
             SearchBuilder<NetworkOfferingJoinVO> sb = networkOfferingJoinDao.createSearchBuilder();
             sb.and("zoneId", sb.entity().getZoneId(), SearchCriteria.Op.FIND_IN_SET);
@@ -7027,7 +7030,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;
                 }
 

From d4b721e9b71272124092ea2fc55ca9da11eab97f Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Wed, 22 Jan 2025 10:09:30 -0500
Subject: [PATCH 2/2] list default offerings only for shared net else old
 behaviour

---
 .../configuration/ConfigurationManagerImpl.java      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
index 0f86179045c5..94a0fd2ea0d9 100644
--- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -6964,10 +6964,14 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
         }
 
         if (tags != null) {
-            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);
+            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) {