Adding cpuallocatedwithoverprovisoning to hostresponse and hostsformigrationresponse

Author: davidjumani

api/src/main/java/org/apache/cloudstack/api/response/HostForMigrationResponse.java

@@ -99,6 +99,10 @@ public class HostForMigrationResponse extends BaseResponse {
     @Param(description = "the amount of the host's CPU currently allocated")
     private String cpuAllocated;
 
+    @SerializedName("cpuallocatedwithoverprovisioning")
+    @Param(description = "the amount of the host's CPU currently allocated after applying the cpu.overprovisioning.factor")
+    private String cpuAllocatedWithOverprovisioning;
+
     @SerializedName("cpuused")
     @Param(description = "the amount of the host's CPU currently used")
     private String cpuUsed;
@@ -303,6 +307,10 @@ public void setCpuAllocated(String cpuAllocated) {
         this.cpuAllocated = cpuAllocated;
     }
 
+    public void setCpuAllocatedWithOverprovisioning(String cpuAllocatedWithOverprovisioning) {
+        this.cpuAllocatedWithOverprovisioning = cpuAllocatedWithOverprovisioning;
+	}
+
     public void setCpuUsed(String cpuUsed) {
         this.cpuUsed = cpuUsed;
     }

api/src/main/java/org/apache/cloudstack/api/response/HostResponse.java

@@ -107,12 +107,16 @@ public class HostResponse extends BaseResponse {
     @Param(description = "the amount of the host's CPU currently allocated")
     private String cpuAllocated;
 
+    @SerializedName("cpuallocatedwithoverprovisioning")
+    @Param(description = "the amount of the host's CPU currently allocated after applying the cpu.overprovisioning.factor")
+    private String cpuAllocatedWithOverprovisioning;
+
     @SerializedName("cpuused")
     @Param(description = "the amount of the host's CPU currently used")
     private String cpuUsed;
 
     @SerializedName("cpuwithoverprovisioning")
-    @Param(description = "the amount of the host's CPU after applying the cpu.overprovisioning.factor ")
+    @Param(description = "the amount of the host's CPU after applying the cpu.overprovisioning.factor")
     private String cpuWithOverprovisioning;
 
     @SerializedName(ApiConstants.CPU_LOAD_AVERAGE)
@@ -342,6 +346,10 @@ public void setCpuAllocated(String cpuAllocated) {
         this.cpuAllocated = cpuAllocated;
     }
 
+    public void setCpuAllocatedWithOverprovisioning(String cpuAllocatedWithOverprovisioning) {
+        this.cpuAllocatedWithOverprovisioning = cpuAllocatedWithOverprovisioning;
+	}
+
     public void setCpuUsed(String cpuUsed) {
         this.cpuUsed = cpuUsed;
     }

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

@@ -193,8 +193,10 @@ public HostResponse newHostResponse(HostJoinVO host, EnumSet<HostDetails> detail
 
                 hostResponse.setHypervisorVersion(host.getHypervisorVersion());
 
+                String cpuAlloc = decimalFormat.format(((float)cpu / (float)(host.getCpus() * host.getSpeed())) * 100f) + "%";
+                hostResponse.setCpuAllocated(cpuAlloc);
                 float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId());
-                hostResponse.setCpuAllocated(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning));
+                hostResponse.setCpuAllocatedWithOverprovisioning(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning));
                 hostResponse.setCpuWithOverprovisioning(decimalFormat.format(cpuWithOverprovisioning));
             }
 
@@ -345,8 +347,10 @@ public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, Enu
 
                 hostResponse.setHypervisorVersion(host.getHypervisorVersion());
 
+                String cpuAlloc = decimalFormat.format(((float)cpu / (float)(host.getCpus() * host.getSpeed())) * 100f) + "%";
+                hostResponse.setCpuAllocated(cpuAlloc);
                 float cpuWithOverprovisioning = host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor(host.getClusterId());
-                hostResponse.setCpuAllocated(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning));
+                hostResponse.setCpuAllocatedWithOverprovisioning(calculateResourceAllocatedPercentage(cpu, cpuWithOverprovisioning));
                 hostResponse.setCpuWithOverprovisioning(decimalFormat.format(cpuWithOverprovisioning));
             }