etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 6836: fixing the api responses for disk offerings. We were using the wrong objext name, and were only returning success responses. Now, we are constructing the apt object and returning the entire object back. 

status 6836: resolved fixed
This commit is contained in:
abhishek 2010-11-01 13:23:19 -07:00
parent 8dda98a1bb
commit 45f4499c14
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java
View File

@ -20,12 +20,17 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.DiskOfferingResponse;
import com.cloud.api.response.ServiceOfferingResponse;
import com.cloud.api.response.SuccessResponse;
import com.cloud.configuration.ConfigurationManager;
import com.cloud.offering.NetworkOffering.GuestIpType;
import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.DiskOfferingVO;
@Implementation(method="updateDiskOffering", manager=ConfigurationManager.class, description="Updates a disk offering.")
@ -78,16 +83,37 @@ public class UpdateDiskOfferingCmd extends BaseCmd{
return s_name;
}
@SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
SuccessResponse response = new SuccessResponse();
DiskOfferingVO responseObject = (DiskOfferingVO)getResponseObject();
if (responseObject != null) {
response.setSuccess(Boolean.TRUE);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update disk offering");
}
// @SuppressWarnings("unchecked")
// public SuccessResponse getResponse() {
// SuccessResponse response = new SuccessResponse();
// DiskOfferingVO responseObject = (DiskOfferingVO)getResponseObject();
// if (responseObject != null) {
// response.setSuccess(Boolean.TRUE);
// } else {
// throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update disk offering");
// }
//
// response.setResponseName(getName());
// return response;
// }
//
@Override @SuppressWarnings("unchecked")
public DiskOfferingResponse getResponse() {
DiskOfferingVO offering = (DiskOfferingVO) getResponseObject();
DiskOfferingResponse response = new DiskOfferingResponse();
response.setId(offering.getId());
response.setName(offering.getName());
response.setDisplayText(offering.getDisplayText());
response.setTags(offering.getTags());
response.setCreated(offering.getCreated());
response.setDiskSize(offering.getDiskSize());
if(offering.getDomainId() != null){
response.setDomain(ApiDBUtils.findDomainById(offering.getDomainId()).getName());
response.setDomainId(offering.getDomainId());
}
response.setMirrored(offering.isMirrored());
response.setTags(offering.getTags());
response.setResponseName(getName());
return response;
}

2
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -1182,7 +1182,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager {
@Override
public DiskOfferingVO updateDiskOffering(UpdateDiskOfferingCmd cmd) throws InvalidParameterValueException{
Long diskOfferingId = cmd.getId();
String name = cmd.getName();
String name = cmd.getDiskOfferingName();
String displayText = cmd.getDisplayText();
String tags = cmd.getTags();