full query param and value

Author: DaanHoogland

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -3457,10 +3457,6 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
             diskOfferingSearch.and("state", diskOfferingSearch.entity().getState(), Op.EQ);
         }
 
-        if (tags != null) {
-            diskOfferingSearch.and("tags", diskOfferingSearch.entity().getTags(), Op.EQ);
-        }
-
         // Keeping this logic consistent with domain specific zones
         // if a domainId is provided, we just return the disk offering
         // associated with this domain
@@ -3525,6 +3521,10 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
             diskOfferingSearch.and("encrypt", diskOfferingSearch.entity().getEncrypt(), Op.EQ);
         }
 
+        if (tags != null) {
+            diskOfferingSearch.and("tags", diskOfferingSearch.entity().getTags(), Op.EQ);
+        }
+
         if (storageType != null || zoneId != null) {
             diskOfferingSearch.and("useLocalStorage", diskOfferingSearch.entity().isUseLocalStorage(), Op.EQ);
         }
@@ -3594,6 +3594,10 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
             sc.setParameters("encrypt", encrypt);
         }
 
+        if (tags != null) {
+            sc.setParameters("tags", tags);
+        }
+
         if (storageType != null) {
             if (storageType.equalsIgnoreCase(ServiceOffering.StorageType.local.toString())) {
                 sc.setParameters("useLocalStorage", true);