diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java index aaef652073e..fba9b2d946a 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java @@ -60,6 +60,14 @@ public class ImageStoreResponse extends BaseResponse { @Param(description = "the scope of the image store") private ScopeType scope; + @SerializedName("disksizetotal") + @Param(description = "the total disk size of the host") + private Long diskSizeTotal; + + @SerializedName("disksizeused") + @Param(description = "the host's currently used disk size") + private Long diskSizeUsed; + public ImageStoreResponse() { } @@ -132,4 +140,12 @@ public class ImageStoreResponse extends BaseResponse { this.protocol = protocol; } + public void setDiskSizeTotal(Long diskSizeTotal) { + this.diskSizeTotal = diskSizeTotal; + } + + public void setDiskSizeUsed(Long diskSizeUsed) { + this.diskSizeUsed = diskSizeUsed; + } + } diff --git a/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java index 7734489dd67..2389b57cf4f 100644 --- a/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java @@ -21,6 +21,8 @@ import java.util.List; import javax.inject.Inject; +import com.cloud.api.ApiDBUtils; +import com.cloud.storage.StorageStats; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -75,6 +77,12 @@ public class ImageStoreJoinDaoImpl extends GenericDaoBase