From f53e18b0ab06970261177e823e08fd2ca4c2fe5b Mon Sep 17 00:00:00 2001 From: nit Date: Mon, 31 Jan 2011 19:10:56 +0530 Subject: [PATCH] bug 8257: Returning hypervisor type in Listvm command so that volume gets attached to the corresponding vm's --- api/src/com/cloud/api/response/UserVmResponse.java | 13 ++++++++++++- server/src/com/cloud/api/ApiResponseHelper.java | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-) mode change 100644 => 100755 api/src/com/cloud/api/response/UserVmResponse.java diff --git a/api/src/com/cloud/api/response/UserVmResponse.java b/api/src/com/cloud/api/response/UserVmResponse.java old mode 100644 new mode 100755 index 113c49f2ec8..a4a3bc3eb73 --- a/api/src/com/cloud/api/response/UserVmResponse.java +++ b/api/src/com/cloud/api/response/UserVmResponse.java @@ -145,7 +145,18 @@ public class UserVmResponse extends BaseResponse { @SerializedName("nic") @Param(description="the list of nics associated with vm", responseObject = NicResponse.class) private List nics; - public Long getObjectId() { + @SerializedName("hypervisor") @Param(description="the hypervisor on which the template runs") + private String hypervisor; + + public String getHypervisor() { + return hypervisor; + } + + public void setHypervisor(String hypervisor) { + this.hypervisor = hypervisor; + } + + public Long getObjectId() { return getId(); } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 9d806f63b09..b1dfa09fa76 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1021,6 +1021,9 @@ public class ApiResponseHelper implements ResponseGenerator { userVmResponse.setHostName(ApiDBUtils.findHostById(userVm.getHostId()).getName()); } + if(userVm.getHypervisorType() != null){ + userVmResponse.setHypervisor(userVm.getHypervisorType().toString()); + } // Template Info VMTemplateVO template = ApiDBUtils.findTemplateById(userVm.getTemplateId()); if (template != null) {