CLOUDSTACK-2946

nitinmeh · nitinmeh · commit 83fcba9ee64c · 2013-06-12T14:58:54.000+05:30
CS-15158: Correcting the allocated size for local storage in listStoragePools
diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java
@@ -22,7 +22,9 @@
 import javax.ejb.Local;
 import javax.inject.Inject;
 
+import com.cloud.capacity.Capacity;
 import org.apache.cloudstack.api.response.StoragePoolResponse;
+import org.apache.cloudstack.engine.subsystem.api.storage.ScopeType;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -150,7 +152,8 @@ public StoragePoolResponse newStoragePoolForMigrationResponse(StoragePoolJoinVO
         }
 
 
-        long allocatedSize = pool.getUsedCapacity() +  pool.getReservedCapacity();
+        short capacityType = pool.getScope() == ScopeType.HOST ? Capacity.CAPACITY_TYPE_LOCAL_STORAGE : Capacity.CAPACITY_TYPE_STORAGE_ALLOCATED;
+        long allocatedSize = ApiDBUtils.getStorageCapacitybyPool(pool.getId(), capacityType);
         poolResponse.setDiskSizeTotal(pool.getCapacityBytes());
         poolResponse.setDiskSizeAllocated(allocatedSize);
 
