Repository: cloudstack Updated Branches: refs/heads/4.4-forward 149cd4b56 -> 4e44ac56c
CLOUDSTACK-6678: API:MS: listCapacity returns; errorcode":530,"cserrorcode":9999,"errortext":"Index: 0, Size: 0"}. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e44ac56 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e44ac56 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e44ac56 Branch: refs/heads/4.4-forward Commit: 4e44ac56c92221c5b9509dca18e14befd7e297fe Parents: 149cd4b Author: Sanjay Tripathi <sanjay.tripa...@citrix.com> Authored: Thu May 15 14:07:10 2014 +0530 Committer: Sanjay Tripathi <sanjay.tripa...@citrix.com> Committed: Thu May 15 14:16:12 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/api/ApiResponseHelper.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e44ac56/server/src/com/cloud/api/ApiResponseHelper.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 4ce9fa6..ce685c6 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1738,7 +1738,7 @@ public class ApiResponseHelper implements ResponseGenerator { } List<VgpuTypesInfo> gpuCapacities; - if ((gpuCapacities = ApiDBUtils.getGpuCapacites(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId())) != null) { + if (!result.isEmpty() && (gpuCapacities = ApiDBUtils.getGpuCapacites(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId())) != null) { HashMap<String, Long> vgpuVMs = ApiDBUtils.getVgpuVmsCount(result.get(0).getDataCenterId(), result.get(0).getPodId(), result.get(0).getClusterId()); float capacityUsed = 0; @@ -1771,7 +1771,11 @@ public class ApiResponseHelper implements ResponseGenerator { capacityResponse.setCapacityType(Capacity.CAPACITY_TYPE_GPU); capacityResponse.setCapacityUsed((long)Math.ceil(capacityUsed)); capacityResponse.setCapacityTotal(capacityMax); - capacityResponse.setPercentUsed(format.format(capacityUsed / capacityMax * 100f)); + if (capacityMax > 0) { + capacityResponse.setPercentUsed(format.format(capacityUsed / capacityMax * 100f)); + } else { + capacityResponse.setPercentUsed(format.format(0)); + } capacityResponse.setObjectName("capacity"); capacityResponses.add(capacityResponse); }
