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

bug 6041: returning the complete embedded reponse for a destroyvm async call

Browse Source 
status 6041: resolved fixed
This commit is contained in:
abhishek 2010-10-19 11:46:01 -07:00
parent f4f00cbe2d
commit 04c8c0f91c
1 changed files with 95 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
server/src/com/cloud/api/commands/DestroyVMCmd.java
View File

@ -21,13 +21,17 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.response.UserVmResponse;
import com.cloud.event.EventTypes;
import com.cloud.offering.ServiceOffering;
import com.cloud.storage.VMTemplateVO;
import com.cloud.user.Account;
import com.cloud.uservm.UserVm;
import com.cloud.vm.InstanceGroupVO;
@Implementation(method="destroyVm", manager=Manager.UserVmManager, description="Destroys a virtual machine. Once destroyed, only the administrator can recover it.")
public class DestroyVMCmd extends BaseAsyncCmd {
@ -80,12 +84,96 @@ public class DestroyVMCmd extends BaseAsyncCmd {
}
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
public UserVmResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
UserVmResponse recoverVmResponse = new UserVmResponse();
UserVm vm = ApiDBUtils.findUserVmById(id);
recoverVmResponse.setSuccess(success);
recoverVmResponse.setResponseName(getName());
recoverVmResponse.setId(vm.getId());
recoverVmResponse.setName(vm.getName());
recoverVmResponse.setCreated(vm.getCreated());
recoverVmResponse.setZoneId(vm.getDataCenterId());
recoverVmResponse.setZoneName(ApiDBUtils.findZoneById(vm.getDataCenterId()).getName());
recoverVmResponse.setIpAddress(vm.getPrivateIpAddress());
recoverVmResponse.setServiceOfferingId(vm.getServiceOfferingId());
recoverVmResponse.setHaEnable(vm.isHaEnabled());
if (vm.getDisplayName() == null || vm.getDisplayName().length() == 0) {
recoverVmResponse.setDisplayName(vm.getName());
} else {
recoverVmResponse.setDisplayName(vm.getDisplayName());
}
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
InstanceGroupVO group = ApiDBUtils.findInstanceGroupForVM(vm.getId());
if (group != null) {
recoverVmResponse.setGroup(group.getName());
recoverVmResponse.setGroupId(group.getId());
}
if (vm.getState() != null) {
recoverVmResponse.setState(vm.getState().toString());
}
Account acct = ApiDBUtils.findAccountById(vm.getAccountId());
if (acct != null) {
recoverVmResponse.setAccountName(acct.getAccountName());
recoverVmResponse.setDomainId(acct.getDomainId());
recoverVmResponse.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName());
}
if (BaseCmd.isAdmin(acct.getType()) && (vm.getHostId() != null)) {
recoverVmResponse.setHostName(ApiDBUtils.findHostById(vm.getHostId()).getName());
recoverVmResponse.setHostId(vm.getHostId());
}
String templateName = "ISO Boot";
boolean templatePasswordEnabled = false;
String templateDisplayText = "ISO Boot";
VMTemplateVO template = ApiDBUtils.findTemplateById(vm.getTemplateId());
if (template != null) {
templateName = template.getName();
templatePasswordEnabled = template.getEnablePassword();
templateDisplayText = template.getDisplayText();
if (templateDisplayText == null) {
templateDisplayText = templateName;
}
}
recoverVmResponse.setTemplateId(vm.getTemplateId());
recoverVmResponse.setTemplateName(templateName);
recoverVmResponse.setTemplateDisplayText(templateDisplayText);
recoverVmResponse.setPasswordEnabled(templatePasswordEnabled);
if (templatePasswordEnabled) {
recoverVmResponse.setPassword(null); // FIXME: Where should password come from? In the old framework, password was always passed
// in to composeResultObject() as null, so that behavior is preserved...
} else {
recoverVmResponse.setPassword("");
}
String isoName = null;
if (vm.getIsoId() != null) {
VMTemplateVO iso = ApiDBUtils.findTemplateById(vm.getIsoId().longValue());
if (iso != null) {
isoName = iso.getName();
}
}
recoverVmResponse.setIsoId(vm.getIsoId());
recoverVmResponse.setIsoName(isoName);
ServiceOffering offering = ApiDBUtils.findServiceOfferingById(vm.getServiceOfferingId());
recoverVmResponse.setServiceOfferingId(vm.getServiceOfferingId());
recoverVmResponse.setServiceOfferingName(offering.getName());
recoverVmResponse.setCpuNumber(offering.getCpu());
recoverVmResponse.setCpuSpeed(offering.getSpeed());
recoverVmResponse.setMemory(offering.getRamSize());
//Network groups
recoverVmResponse.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(vm.getId()));
recoverVmResponse.setResponseName(getName());
return recoverVmResponse;
}
}