From d343af96e50d1a46476c87b1a174a2802e1b736f Mon Sep 17 00:00:00 2001 From: frank Date: Thu, 1 Dec 2011 13:52:39 -0800 Subject: [PATCH] change allocationState of HostResponse to resourceState --- api/src/com/cloud/api/response/HostResponse.java | 12 ++++++------ server/src/com/cloud/api/ApiResponseHelper.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/src/com/cloud/api/response/HostResponse.java b/api/src/com/cloud/api/response/HostResponse.java index 9c3d2d403f6..11f72864b6d 100755 --- a/api/src/com/cloud/api/response/HostResponse.java +++ b/api/src/com/cloud/api/response/HostResponse.java @@ -148,8 +148,8 @@ public class HostResponse extends BaseResponse { @SerializedName("suitableForMigration") @Param(description="true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, max guests vm limit etc) to migrate a VM to it , false otherwise") private Boolean suitableForMigration; - @SerializedName("allocationstate") @Param(description="the allocation state of the host") - private String allocationState; + @SerializedName("resourceState") @Param(description="the resource state of the host") + private String resourceState; @SerializedName(ApiConstants.HYPERVISOR_VERSION) @Param(description="the hypervisor version") private String hypervisorVersion; @@ -472,12 +472,12 @@ public class HostResponse extends BaseResponse { this.suitableForMigration = suitableForMigration; } - public String getAllocationState() { - return allocationState; + public String getResourceState() { + return resourceState; } - public void setAllocationState(String allocationState) { - this.allocationState = allocationState; + public void setResourceState(String resourceState) { + this.resourceState = resourceState; } public String getCpuWithOverprovisioning() { diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 3f2dff6f417..38917d41ebf 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -639,7 +639,7 @@ public class ApiResponseHelper implements ResponseGenerator { } } - hostResponse.setAllocationState(host.getResourceState().toString()); + hostResponse.setResourceState(host.getResourceState().toString()); hostResponse.setObjectName("host");