apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adding memoryallocatedpercentage & memoryallocatedbytes to HostsResponse & HostsForMigrationResponse (#4478)

Browse Source
This commit is contained in:
davidjumani 2020-11-20 16:57:47 +05:30 committed by GitHub
parent a368ba9def
commit d79d24261a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java
View File

@ -128,10 +128,19 @@ public class HostForMigrationResponse extends BaseResponse {
@Param(description = "the outgoing network traffic on the host") @Param(description = "the outgoing network traffic on the host")
private Long networkKbsWrite; private Long networkKbsWrite;
@Deprecated
@SerializedName("memoryallocated") @SerializedName("memoryallocated")
@Param(description = "the amount of the host's memory currently allocated") @Param(description = "the amount of the host's memory currently allocated")
private String memoryAllocated; private String memoryAllocated;
@SerializedName("memoryallocatedpercentage")
@Param(description = "the amount of the host's memory currently allocated in percentage")
private String memoryAllocatedPercentage;
@SerializedName("memoryallocatedbytes")
@Param(description = "the amount of the host's memory currently allocated in bytes")
private Long memoryAllocatedBytes;
@SerializedName("memoryused") @SerializedName("memoryused")
@Param(description = "the amount of the host's memory currently used") @Param(description = "the amount of the host's memory currently used")
private Long memoryUsed; private Long memoryUsed;
@ -314,6 +323,14 @@ public class HostForMigrationResponse extends BaseResponse {
this.memoryAllocated = memoryAllocated; this.memoryAllocated = memoryAllocated;
} }
public void setMemoryAllocatedPercentage(String memoryAllocatedPercentage) {
this.memoryAllocatedPercentage = memoryAllocatedPercentage;
}
public void setMemoryAllocatedBytes(Long memoryAllocatedBytes) {
this.memoryAllocatedBytes = memoryAllocatedBytes;
}
public void setMemoryUsed(Long memoryUsed) { public void setMemoryUsed(Long memoryUsed) {
this.memoryUsed = memoryUsed; this.memoryUsed = memoryUsed;
} }

17
api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java
View File

@ -136,10 +136,19 @@ public class HostResponse extends BaseResponse {
@Param(description = "the amount of the host's memory after applying the mem.overprovisioning.factor") @Param(description = "the amount of the host's memory after applying the mem.overprovisioning.factor")
private String memWithOverprovisioning; private String memWithOverprovisioning;
@Deprecated
@SerializedName("memoryallocated") @SerializedName("memoryallocated")
@Param(description = "the amount of the host's memory currently allocated") @Param(description = "the amount of the host's memory currently allocated")
private long memoryAllocated; private long memoryAllocated;
@SerializedName("memoryallocatedpercentage")
@Param(description = "the amount of the host's memory currently allocated in percentage")
private String memoryAllocatedPercentage;
@SerializedName("memoryallocatedbytes")
@Param(description = "the amount of the host's memory currently allocated in bytes")
private Long memoryAllocatedBytes;
@SerializedName("memoryused") @SerializedName("memoryused")
@Param(description = "the amount of the host's memory currently used") @Param(description = "the amount of the host's memory currently used")
private Long memoryUsed; private Long memoryUsed;
@ -609,6 +618,14 @@ public class HostResponse extends BaseResponse {
return memoryAllocated; return memoryAllocated;
} }
public void setMemoryAllocatedPercentage(String memoryAllocatedPercentage) {
this.memoryAllocatedPercentage = memoryAllocatedPercentage;
}
public void setMemoryAllocatedBytes(Long memoryAllocatedBytes) {
this.memoryAllocatedBytes = memoryAllocatedBytes;
}
public Long getMemoryUsed() { public Long getMemoryUsed() {
return memoryUsed; return memoryUsed;
} }

12
server/src/main/java/com/cloud/api/query/dao/HostJoinDaoImpl.java
View File

@ -170,9 +170,12 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
Long cpu = host.getCpuReservedCapacity() + host.getCpuUsedCapacity(); Long cpu = host.getCpuReservedCapacity() + host.getCpuUsedCapacity();
hostResponse.setMemoryTotal(host.getTotalMemory()); hostResponse.setMemoryTotal(host.getTotalMemory());
Float totalMemorywithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId()); Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
hostResponse.setMemWithOverprovisioning(decimalFormat.format(totalMemorywithOverprovisioning)); hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning));
hostResponse.setMemoryAllocated(mem); hostResponse.setMemoryAllocated(mem);
hostResponse.setMemoryAllocatedBytes(mem);
String memoryAllocatedPercentage = decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%";
hostResponse.setMemoryAllocatedPercentage(memoryAllocatedPercentage);
String hostTags = host.getTag(); String hostTags = host.getTag();
hostResponse.setHostTags(host.getTag()); hostResponse.setHostTags(host.getTag());
@ -321,7 +324,10 @@ public class HostJoinDaoImpl extends GenericDaoBase<HostJoinVO, Long> implements
hostResponse.setMemoryTotal(host.getTotalMemory()); hostResponse.setMemoryTotal(host.getTotalMemory());
Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId()); Float memWithOverprovisioning = host.getTotalMemory() * ApiDBUtils.getMemOverprovisioningFactor(host.getClusterId());
hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning)); hostResponse.setMemWithOverprovisioning(decimalFormat.format(memWithOverprovisioning));
hostResponse.setMemoryAllocated(decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%"); String memoryAllocatedPercentage = decimalFormat.format((float) mem / memWithOverprovisioning * 100.0f) +"%";
hostResponse.setMemoryAllocated(memoryAllocatedPercentage);
hostResponse.setMemoryAllocatedPercentage(memoryAllocatedPercentage);
hostResponse.setMemoryAllocatedBytes(mem);
String hostTags = host.getTag(); String hostTags = host.getTag();
hostResponse.setHostTags(host.getTag()); hostResponse.setHostTags(host.getTag());