Skip to content

Commit d4b721e

Browse files
committed
list default offerings only for shared net else old behaviour
1 parent ae061d8 commit d4b721e

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6964,10 +6964,14 @@ public Pair<List<? extends NetworkOffering>, Integer> searchForNetworkOfferings(
69646964
}
69656965

69666966
if (tags != null) {
6967-
SearchCriteria<NetworkOfferingJoinVO> tagsSc = networkOfferingJoinDao.createSearchCriteria();
6968-
tagsSc.addAnd("tags", SearchCriteria.Op.EQ, tags);
6969-
tagsSc.addOr("isDefault", SearchCriteria.Op.EQ, true);
6970-
sc.addAnd("tags", SearchCriteria.Op.SC, tagsSc);
6967+
if (GuestType.Shared.name().equalsIgnoreCase(guestIpType)) {
6968+
SearchCriteria<NetworkOfferingJoinVO> tagsSc = networkOfferingJoinDao.createSearchCriteria();
6969+
tagsSc.addAnd("tags", SearchCriteria.Op.EQ, tags);
6970+
tagsSc.addOr("isDefault", SearchCriteria.Op.EQ, true);
6971+
sc.addAnd("tags", SearchCriteria.Op.SC, tagsSc);
6972+
} else {
6973+
sc.addAnd("tags", SearchCriteria.Op.EQ, tags);
6974+
}
69716975
}
69726976

69736977
if (zoneId != null) {

0 commit comments

Comments
 (0)