Update search to include host tags

Author: davidjumani

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

@@ -3068,17 +3068,20 @@ private Pair<List<ServiceOfferingJoinVO>, Integer> searchForServiceOfferingsInte
 
         if (currentVmOffering != null) {
             List<String> tags = StringUtils.csvTagsToList(currentVmOffering.getTags());
-            SearchBuilder<ServiceOfferingJoinVO> sb = _srvOfferingJoinDao.createSearchBuilder();
-            for(String tag: tags) {
-                sb.and(tag, sb.entity().getTags(), Op.FIND_IN_SET);
-            }
-            sb.done();
+            tags.addAll(StringUtils.csvTagsToList(currentVmOffering.getHostTag()));
+            if (!tags.isEmpty()) {
+                SearchBuilder<ServiceOfferingJoinVO> sb = _srvOfferingJoinDao.createSearchBuilder();
+                for(int i = 0; i < tags.size(); i++) {
+                    sb.and(Integer.toString(i), sb.entity().getTags(), Op.FIND_IN_SET);
+                }
+                sb.done();
 
-            SearchCriteria<ServiceOfferingJoinVO> scc = sb.create();
-            for(String tag: tags) {
-                scc.setParameters(tag, tag);
+                SearchCriteria<ServiceOfferingJoinVO> scc = sb.create();
+                for(int i = 0; i < tags.size(); i++) {
+                    scc.setParameters(Integer.toString(i), tags.get(i));
+                }
+                sc.addAnd("tags", SearchCriteria.Op.SC, scc);
             }
-            sc.addAnd("tags", SearchCriteria.Op.SC, scc);
         }
 
         return _srvOfferingJoinDao.searchAndCount(sc, searchFilter);