From 04c8c0f91ce3b7074a300520097713356e8a3acf Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Tue, 19 Oct 2010 11:46:01 -0700
Subject: [PATCH] bug 6041: returning the complete embedded reponse for a
 destroyvm async call status 6041: resolved fixed

---
 .../com/cloud/api/commands/DestroyVMCmd.java  | 102 ++++++++++++++++--
 1 file changed, 95 insertions(+), 7 deletions(-)

diff --git a/server/src/com/cloud/api/commands/DestroyVMCmd.java b/server/src/com/cloud/api/commands/DestroyVMCmd.java
index d6304519b09..02b31d2701b 100644
--- a/server/src/com/cloud/api/commands/DestroyVMCmd.java
+++ b/server/src/com/cloud/api/commands/DestroyVMCmd.java
@@ -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;
 	}
 }