From 708cc0c845aef3e0e3179dd19ca66e83347d4023 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Wed, 18 Nov 2020 15:33:18 +0530 Subject: [PATCH] hostresponse: Setting memory allocated to percentage --- .../java/org/apache/cloudstack/api/response/HostResponse.java | 4 ++-- .../main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java index 61a662f0725b..03d259dd3df5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java @@ -138,7 +138,7 @@ public class HostResponse extends BaseResponse { @SerializedName("memoryallocated") @Param(description = "the amount of the host's memory currently allocated") - private long memoryAllocated; + private String memoryAllocated; @SerializedName("memoryused") @Param(description = "the amount of the host's memory currently used") @@ -353,7 +353,7 @@ public void setMemWithOverprovisioning(String memWithOverprovisioning){ this.memWithOverprovisioning=memWithOverprovisioning; } - public void setMemoryAllocated(long memoryAllocated) { + public void setMemoryAllocated(String memoryAllocated) { this.memoryAllocated = memoryAllocated; } diff --git a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java index 597cc1ca446c..f7e33f921215 100644 --- a/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -172,7 +172,7 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet detail hostResponse.setMemoryTotal(host.getTotalMemory()); Float totalMemorywithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId()); hostResponse.setMemWithOverprovisioning(totalMemorywithOverprovisioning.toString()); - hostResponse.setMemoryAllocated(mem); + hostResponse.setMemoryAllocated(decimalFormat.format((float) mem / totalMemorywithOverprovisioning * 100.0f) +"%"); String hostTags = host.getTag(); hostResponse.setHostTags(host.getTag());