api: Fix count and item issues returned by list APIs (#3894)

Author: Pearl1594

api/src/main/java/com/cloud/projects/Project.java

@@ -29,7 +29,7 @@ public enum State {
     }
 
     public enum ListProjectResourcesCriteria {
-        ListProjectResourcesOnly, SkipProjectResources
+        ListProjectResourcesOnly, SkipProjectResources, ListAllIncludingProjectResources
     }
 
     String getDisplayText();

api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java

@@ -125,22 +125,22 @@ public String getCommandName() {
         return s_name;
     }
 
-    protected List<ClusterResponse> getClusterResponses() {
+    protected Pair<List<ClusterResponse>, Integer> getClusterResponses() {
         Pair<List<? extends Cluster>, Integer> result = _mgr.searchForClusters(this);
         List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();
         for (Cluster cluster : result.first()) {
             ClusterResponse clusterResponse = _responseGenerator.createClusterResponse(cluster, showCapacities);
             clusterResponse.setObjectName("cluster");
             clusterResponses.add(clusterResponse);
         }
-        return clusterResponses;
+        return new Pair<List<ClusterResponse>, Integer>(clusterResponses, result.second());
     }
 
     @Override
     public void execute() {
-        List<ClusterResponse> clusterResponses = getClusterResponses();
+        Pair<List<ClusterResponse>, Integer> clusterResponses = getClusterResponses();
         ListResponse<ClusterResponse> response = new ListResponse<ClusterResponse>();
-        response.setResponses(clusterResponses, clusterResponses.size());
+        response.setResponses(clusterResponses.first(), clusterResponses.second());
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
     }

engine/schema/src/main/java/com/cloud/host/dao/HostDao.java

@@ -37,6 +37,8 @@
 public interface HostDao extends GenericDao<HostVO, Long>, StateDao<Status, Status.Event, Host> {
     long countBy(long clusterId, ResourceState... states);
 
+    Integer countAllByType(final Host.Type type);
+
     /**
      * Mark all hosts associated with a certain management server
      * as disconnected.

engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java

@@ -105,6 +105,7 @@ public class HostDaoImpl extends GenericDaoBase<HostVO, Long> implements HostDao
     protected SearchBuilder<HostVO> UnmanagedDirectConnectSearch;
     protected SearchBuilder<HostVO> UnmanagedApplianceSearch;
     protected SearchBuilder<HostVO> MaintenanceCountSearch;
+    protected SearchBuilder<HostVO> HostTypeCountSearch;
     protected SearchBuilder<HostVO> ClusterStatusSearch;
     protected SearchBuilder<HostVO> TypeNameZoneSearch;
     protected SearchBuilder<HostVO> AvailHypevisorInZone;
@@ -159,6 +160,11 @@ public void init() {
         MaintenanceCountSearch.and("resourceState", MaintenanceCountSearch.entity().getResourceState(), SearchCriteria.Op.IN);
         MaintenanceCountSearch.done();
 
+        HostTypeCountSearch = createSearchBuilder();
+        HostTypeCountSearch.and("type", HostTypeCountSearch.entity().getType(), SearchCriteria.Op.EQ);
+        HostTypeCountSearch.and("removed", HostTypeCountSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
+        HostTypeCountSearch.done();
+
         TypePodDcStatusSearch = createSearchBuilder();
         HostVO entity = TypePodDcStatusSearch.entity();
         TypePodDcStatusSearch.and("type", entity.getType(), SearchCriteria.Op.EQ);
@@ -429,6 +435,13 @@ public long countBy(long clusterId, ResourceState... states) {
         return hosts.size();
     }
 
+    @Override
+    public Integer countAllByType(final Host.Type type) {
+        SearchCriteria<HostVO> sc = HostTypeCountSearch.create();
+        sc.setParameters("type", type);
+        return getCount(sc);
+    }
+
     @Override
     public List<HostVO> listByDataCenterId(long id) {
         SearchCriteria<HostVO> sc = DcSearch.create();

engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDao.java

@@ -96,6 +96,13 @@ public interface DomainRouterDao extends GenericDao<DomainRouterVO, Long> {
      */
     public List<DomainRouterVO> listRunningByDomain(Long id);
 
+    /**
+     * gets the total count by role
+     * @Param role Router role
+     * @return count of resources
+     */
+    Integer countAllByRole(Role role);
+
     List<DomainRouterVO> findBy(long accountId, long dcId, Role role);
 
     List<DomainRouterVO> findByNetwork(long networkId);

engine/schema/src/main/java/com/cloud/vm/dao/DomainRouterDaoImpl.java

@@ -185,6 +185,14 @@ public List<DomainRouterVO> listByDataCenter(final long dcId) {
         return listBy(sc);
     }
 
+    @Override
+    public Integer countAllByRole(final Role role) {
+        final SearchCriteria<DomainRouterVO> sc = createSearchCriteria();
+        sc.addAnd("role", SearchCriteria.Op.EQ, role);
+        sc.addAnd("removed", Op.NULL);
+        return getCount(sc);
+    }
+
     @Override
     public List<DomainRouterVO> findBy(final long accountId, final long dcId) {
         final SearchCriteria<DomainRouterVO> sc = AllFieldsSearch.create();

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java

@@ -35,6 +35,8 @@ public interface ImageStoreDao extends GenericDao<ImageStoreVO, Long> {
 
     List<ImageStoreVO> findImageCacheByScope(ZoneScope scope);
 
+    Integer countAllImageStores();
+
     List<ImageStoreVO> listImageStores();
 
     List<ImageStoreVO> listImageCacheStores();

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java

@@ -110,6 +110,14 @@ public List<ImageStoreVO> findImageCacheByScope(ZoneScope scope) {
         return listBy(sc);
     }
 
+    @Override
+    public Integer countAllImageStores() {
+        SearchCriteria<ImageStoreVO> sc = createSearchCriteria();
+        sc.addAnd("role", SearchCriteria.Op.EQ, DataStoreRole.Image);
+        sc.addAnd("removed", SearchCriteria.Op.NULL);
+        return getCount(sc);
+    }
+
     @Override
     public List<ImageStoreVO> listImageStores() {
         SearchCriteria<ImageStoreVO> sc = createSearchCriteria();

framework/db/src/main/java/com/cloud/utils/db/GenericDao.java

@@ -278,4 +278,6 @@ public interface GenericDao<T, ID extends Serializable> {
     Map<String, Attribute> getAllAttributes();
 
     Pair<List<T>, Integer> searchAndDistinctCount(final SearchCriteria<T> sc, final Filter filter, final String[] distinctColumns);
+
+    Integer countAll();
 }

framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java

@@ -1996,6 +1996,15 @@ public Integer getDistinctCount(SearchCriteria<T> sc, String[] distinctColumns)
         }
     }
 
+    public Integer countAll() {
+        SearchCriteria<T> sc = null;
+        if (_removed != null) {
+            sc = createSearchCriteria();
+            sc.addAnd(_removed.second().field.getName(), SearchCriteria.Op.NULL);
+        }
+        return getCount(sc);
+    }
+
     public Integer getCount(SearchCriteria<T> sc) {
         String clause = sc != null ? sc.getWhereClause() : null;
         if (clause != null && clause.length() == 0) {