Don't show object store and backup capacity if total capacity is 0

Author: abh1sar

api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java

@@ -134,6 +134,8 @@ public int compare(CapacityResponse resp1, CapacityResponse resp2) {
                 int res = resp1.getZoneName().compareTo(resp2.getZoneName());
                 if (res != 0) {
                     return res;
+                } else if (getSortBy() != null) {
+                    return 0;
                 } else {
                     return resp1.getCapacityType().compareTo(resp2.getCapacityType());
                 }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -2073,6 +2073,11 @@ public List<CapacityResponse> createCapacityResponse(List<? extends Capacity> re
         List<CapacityResponse> capacityResponses = new ArrayList<CapacityResponse>();
 
         for (Capacity summedCapacity : result) {
+            if (summedCapacity.getTotalCapacity() == 0 &&
+                    (summedCapacity.getCapacityType() == Capacity.CAPACITY_TYPE_BACKUP_STORAGE ||
+                     summedCapacity.getCapacityType() == Capacity.CAPACITY_TYPE_OBJECT_STORAGE)) {
+                continue;
+            }
             CapacityResponse capacityResponse = new CapacityResponse();
             capacityResponse.setCapacityTotal(summedCapacity.getTotalCapacity());
             if (summedCapacity.getAllocatedCapacity() != null) {

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -4248,7 +4248,7 @@ public ObjectStore discoverObjectStore(String name, String url, Long size, Strin
         params.put("url", url);
         params.put("name", name);
         if (size == null) {
-            params.put("size", 0);
+            params.put("size", 0L);
         } else {
             params.put("size", size);
         }
@@ -4347,11 +4347,12 @@ public CapacityVO getObjectStorageUsedStats(Long zoneId) {
         Long allocated = 0L;
         Long total = 0L;
         for (ObjectStoreVO objectStore: objectStores) {
-            if (objectStore.getAllocatedSize() == null || objectStore.getTotalSize() == null) {
-                continue;
+            if (objectStore.getAllocatedSize() != null) {
+                allocated += objectStore.getAllocatedSize();
+            }
+            if (objectStore.getTotalSize() != null) {
+                total += objectStore.getTotalSize();
             }
-            allocated += objectStore.getAllocatedSize();
-            total += objectStore.getTotalSize();
         }
         CapacityVO capacity = new CapacityVO(null, zoneId, null, null, allocated, total, Capacity.CAPACITY_TYPE_OBJECT_STORAGE);
         return capacity;