apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7059: refactored the API to now add the single embedded object tag after a response

Browse Source 
- Changed networkgroups to security groups
- a whole bunch of other API bugs.  Unfortunately, I may have broken more.
This commit is contained in:
will 2010-11-05 20:09:33 -07:00
parent baa1a5996c
commit a3dbc34857
121 changed files with 326 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/tomcatconf/commands.properties.in
View File

@ -132,7 +132,7 @@ listSystemVms=com.cloud.api.commands.ListSystemVMsCmd;1
#### configuration commands
updateConfiguration=com.cloud.api.commands.UpdateCfgCmd;1
listConfigurations=com.cloud.api.commands.ListCfgsByCmd;1
addConfig=com.cloud.api.commands.AddConfigCmd;15
createConfiguration=com.cloud.api.commands.AddConfigCmd;1
listCapabilities=com.cloud.api.commands.ListCapabilitiesCmd;15
#### pod commands
@ -195,11 +195,11 @@ enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintena
cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1
#### network group commands
createNetworkGroup=com.cloud.api.commands.CreateNetworkGroupCmd;11
deleteNetworkGroup=com.cloud.api.commands.DeleteNetworkGroupCmd;11
authorizeNetworkGroupIngress=com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;11
revokeNetworkGroupIngress=com.cloud.api.commands.RevokeNetworkGroupIngressCmd;11
listNetworkGroups=com.cloud.api.commands.ListNetworkGroupsCmd;11
createSecurityGroup=com.cloud.api.commands.CreateNetworkGroupCmd;11
deleteSecurityGroup=com.cloud.api.commands.DeleteNetworkGroupCmd;11
authorizeSecurityGroupIngress=com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;11
revokeSecurityGroupIngress=com.cloud.api.commands.RevokeNetworkGroupIngressCmd;11
listSecurityGroups=com.cloud.api.commands.ListNetworkGroupsCmd;11
registerPreallocatedLun=com.cloud.api.commands.RegisterPreallocatedLunCmd;1
deletePreallocatedLun=com.cloud.api.commands.DeletePreallocatedLunCmd;1

36
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -118,6 +118,7 @@ public class ApiResponseHelper {
userResponse.setUsername(user.getUsername());
userResponse.setApiKey(user.getApiKey());
userResponse.setSecretKey(user.getSecretKey());
userResponse.setObjectName("user");
return userResponse;
}
@ -216,6 +217,7 @@ public class ApiResponseHelper {
accountResponse.setVmStopped(vmStopped);
accountResponse.setVmRunning(vmRunning);
accountResponse.setObjectName("account");
return accountResponse;
}
@ -232,6 +234,7 @@ public class ApiResponseHelper {
if (domain.getChildCount() > 0) {
domainResponse.setHasChild(true);
}
domainResponse.setObjectName("domain");
return domainResponse;
}
@ -248,6 +251,7 @@ public class ApiResponseHelper {
}
diskOfferingResponse.setTags(offering.getTags());
diskOfferingResponse.setCustomized(offering.isCustomized());
diskOfferingResponse.setObjectName("diskoffering");
return diskOfferingResponse;
}
@ -268,6 +272,7 @@ public class ApiResponseHelper {
}
resourceLimitResponse.setResourceType(Integer.valueOf(limit.getType().ordinal()).toString());
resourceLimitResponse.setMax(limit.getMax());
resourceLimitResponse.setObjectName("resourcelimit");
return resourceLimitResponse;
}
@ -286,6 +291,7 @@ public class ApiResponseHelper {
offeringResponse.setOfferHa(offering.getOfferHA());
offeringResponse.setUseVirtualNetwork(offering.getGuestIpType().equals(GuestIpType.Virtualized));
offeringResponse.setTags(offering.getTags());
offeringResponse.setObjectName("serviceoffering");
return offeringResponse;
}
@ -296,6 +302,7 @@ public class ApiResponseHelper {
cfgResponse.setDescription(cfg.getDescription());
cfgResponse.setName(cfg.getName());
cfgResponse.setValue(cfg.getValue());
cfgResponse.setObjectName("configuration");
return cfgResponse;
}
@ -325,6 +332,7 @@ public class ApiResponseHelper {
snapshotResponse.setJobId(asyncJob.getId());
snapshotResponse.setJobStatus(asyncJob.getStatus());
}
snapshotResponse.setObjectName("snapshot");
return snapshotResponse;
}
@ -337,6 +345,7 @@ public class ApiResponseHelper {
policyResponse.setIntervalType(policy.getInterval());
policyResponse.setMaxSnaps(policy.getMaxSnaps());
policyResponse.setTimezone(policy.getTimezone());
policyResponse.setObjectName("snapshotpolicy");
return policyResponse;
}
@ -456,7 +465,7 @@ public class ApiResponseHelper {
userVmResponse.setGuestOsId(userVm.getGuestOSId());
//network groups
userVmResponse.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId()));
userVmResponse.setObjectName("virtualmachine");
return userVmResponse;
}
@ -510,6 +519,7 @@ public class ApiResponseHelper {
ConsoleProxyVO proxy = (ConsoleProxyVO)systemVM;
vmResponse.setActiveViewerSessions(proxy.getActiveSession());
}
vmResponse.setObjectName("systemvm");
return vmResponse;
}
@ -557,7 +567,7 @@ public class ApiResponseHelper {
routerResponse.setDomainId(accountTemp.getDomainId());
routerResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
routerResponse.setObjectName("domainrouter");
return routerResponse;
}
@ -652,6 +662,7 @@ public class ApiResponseHelper {
}
hostResponse.setEvents(events);
}
hostResponse.setObjectName("host");
return hostResponse;
}
@ -682,6 +693,7 @@ public class ApiResponseHelper {
vlanResponse.setGateway(vlan.getVlanGateway());
vlanResponse.setNetmask(vlan.getVlanNetmask());
vlanResponse.setDescription(vlan.getIpRange());
vlanResponse.setObjectName("vlan");
return vlanResponse;
}
@ -715,7 +727,7 @@ public class ApiResponseHelper {
ipResponse.setVlanId(ipAddress.getVlanDbId());
ipResponse.setVlanName(ApiDBUtils.findVlanById(ipAddress.getVlanDbId()).getVlanId());
}
ipResponse.setObjectName("ipaddress");
return ipResponse;
}
@ -735,7 +747,7 @@ public class ApiResponseHelper {
lbResponse.setDomainId(accountTemp.getDomainId());
lbResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
lbResponse.setObjectName("loadbalancer");
return lbResponse;
}
@ -756,7 +768,7 @@ public class ApiResponseHelper {
podResponse.setStartIp(ipRange[0]);
podResponse.setEndIp(((ipRange.length > 1) && (ipRange[1] != null)) ? ipRange[1] : "");
podResponse.setGateway(pod.getGateway());
podResponse.setObjectName("pod");
return podResponse;
}
@ -781,7 +793,7 @@ public class ApiResponseHelper {
zoneResponse.setDomain(dataCenter.getDomain());
zoneResponse.setDomainId(dataCenter.getDomainId());
zoneResponse.setObjectName("zone");
return zoneResponse;
}
@ -862,7 +874,7 @@ public class ApiResponseHelper {
}
volResponse.setHypervisor(ApiDBUtils.getVolumeHyperType(volume.getId()).toString());
volResponse.setAttached(volume.getAttached());
volResponse.setObjectName("volume");
return volResponse;
}
@ -879,7 +891,7 @@ public class ApiResponseHelper {
groupResponse.setDomainId(accountTemp.getDomainId());
groupResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
groupResponse.setObjectName("instancegroup");
return groupResponse;
}
@ -893,7 +905,7 @@ public class ApiResponseHelper {
preallocLunResponse.setSize(preallocatedLun.getSize());
preallocLunResponse.setTaken(preallocatedLun.getTaken());
preallocLunResponse.setTargetIqn(preallocatedLun.getTargetIqn());
preallocLunResponse.setObjectName("preallocatedlun");
return preallocLunResponse;
}
@ -936,7 +948,7 @@ public class ApiResponseHelper {
poolResponse.setClusterName(cluster.getName());
}
poolResponse.setTags(ApiDBUtils.getStoragePoolTags(pool.getId()));
poolResponse.setObjectName("storagepool");
return poolResponse;
}
@ -951,7 +963,7 @@ public class ApiResponseHelper {
clusterResponse.setPodName(pod.getName());
DataCenterVO zone = ApiDBUtils.findZoneById(cluster.getDataCenterId());
clusterResponse.setZoneName(zone.getName());
clusterResponse.setObjectName("cluster");
return clusterResponse;
}
@ -966,7 +978,7 @@ public class ApiResponseHelper {
response.setVirtualMachineId(vm.getId());
response.setVirtualMachineName(vm.getHostName());
}
response.setObjectName("portforwardingrule");
return response;
}

12
server/src/com/cloud/api/ResponseObject.java
View File

@ -12,4 +12,16 @@ public interface ResponseObject {
* @param name
*/
void setResponseName(String name);
/**
* Get the name of the API object
* @return the name of the API object
*/
String getObjectName();
/**
* Set the name of the APIobject
* @param name
*/
void setObjectName(String name);
}

5
server/src/com/cloud/api/ResponseObjectTypeAdapter.java
View File

@ -17,8 +17,7 @@ import com.google.gson.JsonSerializer;
import com.google.gson.annotations.SerializedName;
public class ResponseObjectTypeAdapter implements JsonSerializer<ResponseObject> {
public static final Logger s_logger = Logger
.getLogger(ResponseObjectTypeAdapter.class.getName());
public static final Logger s_logger = Logger.getLogger(ResponseObjectTypeAdapter.class.getName());
@Override
public JsonElement serialize(ResponseObject responseObj, Type typeOfResponseObj, JsonSerializationContext ctx) {
@ -76,7 +75,7 @@ public class ResponseObjectTypeAdapter implements JsonSerializer<ResponseObject>
}
}
JsonObject response = new JsonObject();
response.add(responseObj.getResponseName(), obj);
response.add(responseObj.getObjectName(), obj);
return response;
}
}

1
server/src/com/cloud/api/commands/AddHostCmd.java
View File

@ -115,7 +115,6 @@ public class AddHostCmd extends BaseCmd {
if (hosts != null) {
for (HostVO host : hosts) {
HostResponse hostResponse = ApiResponseHelper.createHostResponse(host);
hostResponse.setResponseName("host");
hostResponses.add(hostResponse);
}
} else {

22
server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java
View File

@ -71,24 +71,20 @@ public class AddSecondaryStorageCmd extends BaseCmd {
}
@Override @SuppressWarnings("unchecked")
public ListResponse<HostResponse> getResponse() {
public HostResponse getResponse() {
List<HostVO> hosts = (List<HostVO>)getResponseObject();
ListResponse<HostResponse> response = new ListResponse<HostResponse>();
List<HostResponse> hostResponses = new ArrayList<HostResponse>();
if (hosts != null) {
HostResponse hostResponse = null;
if (hosts != null && hosts.size() > 0) {
for (HostVO host : hosts) {
HostResponse hostResponse = ApiResponseHelper.createHostResponse(host);
hostResponse.setResponseName("secondarystorage");
hostResponses.add(hostResponse);
// There should only be one secondary storage host per add
hostResponse = ApiResponseHelper.createHostResponse(host);
hostResponse.setResponseName(getName());
hostResponse.setObjectName("secondarystorage");
return hostResponse;
}
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add secondary storage");
}
response.setResponses(hostResponses);
response.setResponseName(getName());
return response;
//return ApiResponseSerializer.toSerializedString(response);
return hostResponse;
}
}

3
server/src/com/cloud/api/commands/AddVpnUserCmd.java
View File

@ -106,7 +106,8 @@ public class AddVpnUserCmd extends BaseAsyncCmd {
vpnResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
vpnResponse.setResponseName("vpnuser");
vpnResponse.setResponseName(getName());
vpnResponse.setObjectName("vpnuser");
return vpnResponse;
}

3
server/src/com/cloud/api/commands/AttachIsoCmd.java
View File

@ -108,7 +108,8 @@ public class AttachIsoCmd extends BaseAsyncCmd {
response.setVirtualMachineId(virtualMachineId);
response.setVirtualMachineName(vmInstance.getHostName());
response.setVirtualMachineState(vmInstance.getState().toString());
response.setResponseName("iso");
response.setResponseName(getName());
response.setObjectName("iso");
return response;
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to attach iso");

2
server/src/com/cloud/api/commands/AttachVolumeCmd.java
View File

@ -110,7 +110,7 @@ public class AttachVolumeCmd extends BaseAsyncCmd {
public VolumeResponse getResponse() {
VolumeVO volume = (VolumeVO)getResponseObject();
VolumeResponse response = ApiResponseHelper.createVolumeResponse(volume);
response.setResponseName("volume");
response.setResponseName(getName());
return response;
}
}

4
server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java
View File

@ -232,13 +232,13 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd {
ingressData.setCidr(ingressRule.getAllowedSourceIpCidr());
}
ingressData.setResponseName("ingressrule");
ingressData.setObjectName("ingressrule");
responses.add(ingressData);
}
response.setResponses(responses);
}
response.setResponseName("networkgroup");
response.setResponseName("securitygroupingressrule");
return response;
}
}

2
server/src/com/cloud/api/commands/CancelMaintenanceCmd.java
View File

@ -92,7 +92,7 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd {
public HostResponse getResponse() {
HostVO host = (HostVO)getResponseObject();
HostResponse response = ApiResponseHelper.createHostResponse(host);
response.setResponseName("success");
response.setResponseName(getName());
return response;
}
}

2
server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java
View File

@ -92,7 +92,7 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd {
public StoragePoolResponse getResponse() {
StoragePoolVO primaryStorage = (StoragePoolVO)getResponseObject();
StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(primaryStorage);
response.setResponseName("storagepool");
response.setResponseName(getName());
return response;
}
}

3
server/src/com/cloud/api/commands/CopyIsoCmd.java
View File

@ -175,7 +175,8 @@ public class CopyIsoCmd extends BaseAsyncCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to copy iso");
}
isoResponse.setResponseName("iso");
isoResponse.setResponseName(getName());
isoResponse.setObjectName("iso");
return isoResponse;
}

3
server/src/com/cloud/api/commands/CopyTemplateCmd.java
View File

@ -178,7 +178,8 @@ public class CopyTemplateCmd extends BaseAsyncCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to copy template");
}
templateResponse.setResponseName("template");
templateResponse.setResponseName(getName());
templateResponse.setObjectName("template");
return templateResponse;
}
}

4
server/src/com/cloud/api/commands/AddConfigCmd.java → server/src/com/cloud/api/commands/CreateCfgCmd.java
View File

@ -30,8 +30,8 @@ import com.cloud.configuration.ConfigurationManager;
import com.cloud.configuration.ConfigurationVO;
@Implementation(method="addConfig", manager=ConfigurationManager.class)
public class AddConfigCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddConfigCmd.class.getName());
public class CreateCfgCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateCfgCmd.class.getName());
private static final String s_name = "addconfigresponse";
/////////////////////////////////////////////////////

3
server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java
View File

@ -32,7 +32,7 @@ import com.cloud.network.security.NetworkGroupVO;
public class CreateNetworkGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkGroupCmd.class.getName());
private static final String s_name = "createnetworkgroupresponse";
private static final String s_name = "createsecuritygroupresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -93,6 +93,7 @@ public class CreateNetworkGroupCmd extends BaseCmd {
response.setName(group.getName());
response.setResponseName(getName());
response.setObjectName("securitygroup");
return response;
}
}

3
server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java
View File

@ -110,7 +110,8 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
response.setAccountName(responseObj.getAccountName());
response.setDomainId(responseObj.getDomainId());
response.setDomainName(ApiDBUtils.findDomainById(responseObj.getDomainId()).getName());
response.setResponseName("remoteaccessvpn");
response.setObjectName("remoteaccessvpn");
response.setResponseName(getName());
response.setPresharedKey(responseObj.getIpsecPresharedKey());
return response;
}

2
server/src/com/cloud/api/commands/CreateSnapshotCmd.java
View File

@ -109,7 +109,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
if (snapshot != null) {
SnapshotResponse response = ApiResponseHelper.createSnapshotResponse(snapshot);
response.setResponseName("snapshot");
response.setResponseName(getName());
return response;
}

4
server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java
View File

@ -115,8 +115,8 @@ public class CreateSnapshotInternalCmd extends BaseAsyncCmd {
response.setVolumeType(volume.getVolumeType().toString());
response.setCreated(snapshot.getCreated());
response.setName(snapshot.getName());
response.setResponseName("snapshot");
response.setObjectName("snapshot");
response.setResponseName(getName());
return response;
}
}

3
server/src/com/cloud/api/commands/CreateTemplateCmd.java
View File

@ -211,7 +211,8 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
response.setZoneName(zone.getName());
}
response.setResponseName("template");
response.setObjectName("template");
response.setResponseName(getName());
return response;
}
}

2
server/src/com/cloud/api/commands/CreateVolumeCmd.java
View File

@ -146,7 +146,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
VolumeResponse response = ApiResponseHelper.createVolumeResponse(volume);
//FIXME - have to be moved to ApiResponseHelper
response.setSnapshotId(getSnapshotId()); // if the volume was created from a snapshot, snapshotId will be set so we pass it back in the response
response.setResponseName("volume");
response.setResponseName(getName());
return response;
}
}

1
server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java
View File

@ -69,7 +69,6 @@ public class DeleteDiskOfferingCmd extends BaseCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete disk offering");
}
response.setResponseName(getName());
return response;
}
}

1
server/src/com/cloud/api/commands/DeleteDomainCmd.java
View File

@ -100,7 +100,6 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host");
}
response.setResponseName("success");
return response;
}
}

1
server/src/com/cloud/api/commands/DeleteHostCmd.java
View File

@ -72,7 +72,6 @@ public class DeleteHostCmd extends BaseCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host");
}
response.setResponseName(getName());
return response;
}
}

11
server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java
View File

@ -23,6 +23,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.network.NetworkManager;
@ -58,10 +59,10 @@ public class DeleteIPForwardingRuleCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete port forwarding rule");
}
}
}

16
server/src/com/cloud/api/commands/DeleteIsoCmd.java
View File

@ -75,17 +75,11 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
SuccessResponse response = new SuccessResponse();
Boolean responseObject = (Boolean)getResponseObject();
if (responseObject != null) {
response.setSuccess(responseObject);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete iso");
}
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete iso");
}
}
@Override

12
server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
View File

@ -22,8 +22,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.network.LoadBalancerVO;
@ -81,10 +83,10 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete load balancer rule");
}
}
}

10
server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java
View File

@ -6,6 +6,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.network.security.NetworkGroupManager;
@ -56,9 +57,10 @@ public class DeleteNetworkGroupCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
SuccessResponse response = new SuccessResponse();
response.setSuccess(Boolean.TRUE);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete security group");
}
}
}

16
server/src/com/cloud/api/commands/DeletePodCmd.java
View File

@ -60,16 +60,10 @@ public class DeletePodCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
SuccessResponse response = new SuccessResponse();
Boolean responseObject = (Boolean)getResponseObject();
if (responseObject != null) {
response.setSuccess(responseObject);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pod");
}
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pod");
}
}
}

18
server/src/com/cloud/api/commands/DeletePoolCmd.java
View File

@ -13,7 +13,7 @@ import com.cloud.storage.StorageManager;
@Implementation(method="deletePool", manager=StorageManager.class, description="Deletes a storage pool.")
public class DeletePoolCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeletePoolCmd.class.getName());
private static final String s_name = "deletepoolresponse";
private static final String s_name = "deletestoragepoolresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -43,16 +43,10 @@ public class DeletePoolCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
SuccessResponse response = new SuccessResponse();
Boolean responseObject = (Boolean)getResponseObject();
if (responseObject != null) {
response.setSuccess(responseObject);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pool");
}
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete storage pool");
}
}
}

13
server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java
View File

@ -21,6 +21,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
@Implementation(method="unregisterPreallocatedLun")
@ -53,12 +54,10 @@ public class DeletePreallocatedLunCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean result = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(result);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete preallocated lun");
}
}
}

12
server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
View File

@ -22,8 +22,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.network.NetworkManager;
@ -79,11 +81,11 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete remote access vpn");
}
}
@Override

11
server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java
View File

@ -24,6 +24,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.configuration.ConfigurationManager;
@ -60,10 +61,10 @@ public class DeleteServiceOfferingCmd extends BaseCmd{
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete service offering");
}
}
}

12
server/src/com/cloud/api/commands/DeleteSnapshotCmd.java
View File

@ -23,8 +23,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.storage.Snapshot;
@ -97,10 +99,10 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete snapshot");
}
}
}

11
server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java
View File

@ -26,6 +26,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.storage.snapshot.SnapshotManager;
@ -84,10 +85,10 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete snapshot policy");
}
}
}

12
server/src/com/cloud/api/commands/DeleteTemplateCmd.java
View File

@ -23,8 +23,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.storage.VMTemplateVO;
@ -75,11 +77,11 @@ public class DeleteTemplateCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete template");
}
}
@Override

12
server/src/com/cloud/api/commands/DeleteUserCmd.java
View File

@ -23,8 +23,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.server.ManagementServer;
@ -90,10 +92,10 @@ public class DeleteUserCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete user");
}
}
}

13
server/src/com/cloud/api/commands/DeleteVMGroupCmd.java
View File

@ -23,6 +23,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.vm.UserVmManager;
@ -57,12 +58,10 @@ public class DeleteVMGroupCmd extends BaseCmd{
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete virtual machine group");
}
}
}

11
server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java
View File

@ -24,6 +24,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.configuration.ConfigurationManager;
@ -59,10 +60,10 @@ public class DeleteVlanIpRangeCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete vlan ip range");
}
}
}

11
server/src/com/cloud/api/commands/DeleteVolumeCmd.java
View File

@ -24,6 +24,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.storage.StorageManager;
@ -64,10 +65,10 @@ public class DeleteVolumeCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete volume");
}
}
}

11
server/src/com/cloud/api/commands/DeleteZoneCmd.java
View File

@ -24,6 +24,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.configuration.ConfigurationManager;
@ -61,10 +62,10 @@ public class DeleteZoneCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete zone");
}
}
}

2
server/src/com/cloud/api/commands/DeployVMCmd.java
View File

@ -196,7 +196,7 @@ public class DeployVMCmd extends BaseAsyncCmd {
// if (templatePasswordEnabled) {
// response.setPassword(getPassword());
// }
response.setResponseName("virtualmachine");
response.setResponseName(getName());
return response;
}
}

1
server/src/com/cloud/api/commands/DeployVm2Cmd.java
View File

@ -295,6 +295,7 @@ public class DeployVm2Cmd extends BaseAsyncCreateCmd {
response.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId()));
response.setResponseName(getName());
response.setObjectName("virtualmachine");
return response;
}
}

12
server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java
View File

@ -22,8 +22,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.consoleproxy.ConsoleProxyManager;
import com.cloud.event.EventTypes;
@ -84,10 +86,10 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete console proxy");
}
}
}

12
server/src/com/cloud/api/commands/DetachIsoCmd.java
View File

@ -22,8 +22,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.template.TemplateManager;
@ -82,10 +84,10 @@ public class DetachIsoCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("iso");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to detach iso");
}
}
}

2
server/src/com/cloud/api/commands/DisableAccountCmd.java
View File

@ -91,7 +91,7 @@ public class DisableAccountCmd extends BaseAsyncCmd {
public AccountResponse getResponse() {
AccountVO account = (AccountVO)getResponseObject();
AccountResponse response = ApiResponseHelper.createAccountResponse(account);
response.setResponseName("account");
response.setResponseName(getName());
return response;
}
}

2
server/src/com/cloud/api/commands/DisableUserCmd.java
View File

@ -83,7 +83,7 @@ public class DisableUserCmd extends BaseAsyncCmd {
public UserResponse getResponse() {
UserAccount user = (UserAccount)getResponseObject();
UserResponse response = ApiResponseHelper.createUserResponse(user);
response.setResponseName("user");
response.setResponseName(getName());
return response;
}
}

11
server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java
View File

@ -23,6 +23,7 @@ import com.cloud.api.ApiConstants;
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.SuccessResponse;
import com.cloud.network.NetworkManager;
@ -58,10 +59,10 @@ public class DisassociateIPAddrCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName(getName());
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disassociate ip address");
}
}
}

3
server/src/com/cloud/api/commands/ExtractIsoCmd.java
View File

@ -108,7 +108,6 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId);
ExtractResponse response = new ExtractResponse();
response.setResponseName("iso");
response.setId(id);
response.setName(ApiDBUtils.findTemplateById(id).getName());
response.setZoneId(zoneId);
@ -120,6 +119,8 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
//FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now due to a bug.
//response.setUrl(uploadInfo.getUploadUrl());
response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F"));
response.setResponseName(getName());
response.setObjectName("iso");
return response;
}

3
server/src/com/cloud/api/commands/ExtractTemplateCmd.java
View File

@ -113,7 +113,8 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId);
ExtractResponse response = new ExtractResponse();
response.setResponseName("template");
response.setResponseName(getName());
response.setObjectName("template");
response.setId(id);
response.setName(ApiDBUtils.findTemplateById(id).getName());
response.setZoneId(zoneId);

3
server/src/com/cloud/api/commands/ExtractVolumeCmd.java
View File

@ -111,7 +111,8 @@ public class ExtractVolumeCmd extends BaseAsyncCmd {
UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId);
ExtractResponse response = new ExtractResponse();
response.setResponseName("volume");
response.setResponseName(getName());
response.setObjectName("volume");
response.setId(id);
response.setName(ApiDBUtils.findVolumeById(id).getName());
response.setZoneId(zoneId);

1
server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java
View File

@ -71,6 +71,7 @@ public class GetCloudIdentifierCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config");
}
response.setObjectName("cloudidentifier");
response.setResponseName(getName());
return response;
}

2
server/src/com/cloud/api/commands/ListAccountsCmd.java
View File

@ -113,7 +113,7 @@ public class ListAccountsCmd extends BaseListCmd {
List<AccountResponse> accountResponses = new ArrayList<AccountResponse>();
for (AccountVO account : accounts) {
AccountResponse acctResponse = ApiResponseHelper.createAccountResponse(account);
acctResponse.setResponseName("account");
acctResponse.setObjectName("account");
accountResponses.add(acctResponse);
}

2
server/src/com/cloud/api/commands/ListAlertsCmd.java
View File

@ -74,7 +74,7 @@ public class ListAlertsCmd extends BaseListCmd {
alertResponse.setDescription(alert.getSubject());
alertResponse.setLastSent(alert.getLastSent());
alertResponse.setResponseName("alert");
alertResponse.setObjectName("alert");
alertResponseList.add(alertResponse);
}

2
server/src/com/cloud/api/commands/ListAsyncJobsCmd.java
View File

@ -94,7 +94,7 @@ public class ListAsyncJobsCmd extends BaseListCmd {
jobResponse.setJobStatus(job.getStatus());
jobResponse.setUserId(job.getUserId());
jobResponse.setResponseName("asyncjobs");
jobResponse.setObjectName("asyncjobs");
jobResponses.add(jobResponse);
}

1
server/src/com/cloud/api/commands/ListCapabilitiesCmd.java
View File

@ -43,6 +43,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
CapabilitiesResponse response = new CapabilitiesResponse();
response.setNetworkGroupsEnabled(capabilities.get("networkGroupsEnabled"));
response.setCloudStackVersion(capabilities.get("cloudStackVersion"));
response.setObjectName("capability");
response.setResponseName(getName());
return response;

2
server/src/com/cloud/api/commands/ListCapacityCmd.java
View File

@ -134,7 +134,7 @@ public class ListCapacityCmd extends BaseListCmd {
capacityResponse.setPercentUsed(s_percentFormat.format(0L));
}
capacityResponse.setResponseName("capacity");
capacityResponse.setObjectName("capacity");
capacityResponses.add(capacityResponse);
}

2
server/src/com/cloud/api/commands/ListCfgsByCmd.java
View File

@ -79,7 +79,7 @@ public class ListCfgsByCmd extends BaseListCmd {
List<ConfigurationResponse> configResponses = new ArrayList<ConfigurationResponse>();
for (ConfigurationVO cfg : configurations) {
ConfigurationResponse cfgResponse = ApiResponseHelper.createConfigurationResponse(cfg);
cfgResponse.setResponseName("configuration");
cfgResponse.setObjectName("configuration");
configResponses.add(cfgResponse);
}

2
server/src/com/cloud/api/commands/ListClustersCmd.java
View File

@ -92,7 +92,7 @@ public class ListClustersCmd extends BaseListCmd {
List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();
for (ClusterVO cluster : clusters) {
ClusterResponse clusterResponse = ApiResponseHelper.createClusterResponse(cluster);
clusterResponse.setResponseName("cluster");
clusterResponse.setObjectName("cluster");
clusterResponses.add(clusterResponse);
}

2
server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java
View File

@ -83,7 +83,7 @@ public class ListDiskOfferingsCmd extends BaseListCmd {
List<DiskOfferingResponse> diskOfferingResponses = new ArrayList<DiskOfferingResponse>();
for (DiskOfferingVO offering : offerings) {
DiskOfferingResponse diskOffResp = ApiResponseHelper.createDiskOfferingResponse(offering);
diskOffResp.setResponseName("diskoffering");
diskOffResp.setObjectName("diskoffering");
diskOfferingResponses.add(diskOffResp);
}

2
server/src/com/cloud/api/commands/ListDomainChildrenCmd.java
View File

@ -83,7 +83,7 @@ public class ListDomainChildrenCmd extends BaseListCmd {
List<DomainResponse> domainResponses = new ArrayList<DomainResponse>();
for (DomainVO domain : domains) {
DomainResponse domainResponse = ApiResponseHelper.createDomainResponse(domain);
domainResponse.setResponseName("domain");
domainResponse.setObjectName("domain");
domainResponses.add(domainResponse);
}

2
server/src/com/cloud/api/commands/ListDomainsCmd.java
View File

@ -83,7 +83,7 @@ public class ListDomainsCmd extends BaseListCmd {
List<DomainResponse> domainResponses = new ArrayList<DomainResponse>();
for (DomainVO domain : domains) {
DomainResponse domainResponse = ApiResponseHelper.createDomainResponse(domain);
domainResponse.setResponseName("domain");
domainResponse.setObjectName("domain");
domainResponses.add(domainResponse);
}

2
server/src/com/cloud/api/commands/ListEventsCmd.java
View File

@ -135,7 +135,7 @@ public class ListEventsCmd extends BaseListCmd {
responseEvent.setUsername(user.getUsername());
}
responseEvent.setResponseName("event");
responseEvent.setObjectName("event");
eventResponses.add(responseEvent);
}

2
server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java
View File

@ -74,7 +74,7 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
categoryResponse.setId(osCategory.getId());
categoryResponse.setName(osCategory.getName());
categoryResponse.setResponseName("oscategory");
categoryResponse.setObjectName("oscategory");
osCatResponses.add(categoryResponse);
}

2
server/src/com/cloud/api/commands/ListGuestOsCmd.java
View File

@ -92,7 +92,7 @@ public class ListGuestOsCmd extends BaseListCmd {
guestOSResponse.setId(guestOS.getId());
guestOSResponse.setOsCategoryId(guestOS.getCategoryId());
guestOSResponse.setResponseName("ostype");
guestOSResponse.setObjectName("ostype");
osResponses.add(guestOSResponse);
}

2
server/src/com/cloud/api/commands/ListHostsCmd.java
View File

@ -114,7 +114,7 @@ public class ListHostsCmd extends BaseListCmd {
List<HostResponse> hostResponses = new ArrayList<HostResponse>();
for (HostVO host : hosts) {
HostResponse hostResponse = ApiResponseHelper.createHostResponse(host);
hostResponse.setResponseName("host");
hostResponse.setObjectName("host");
hostResponses.add(hostResponse);
}

2
server/src/com/cloud/api/commands/ListHypervisorsCmd.java
View File

@ -45,7 +45,7 @@ public class ListHypervisorsCmd extends BaseCmd {
for (String hypervisor : hypervisorList) {
HypervisorResponse hypervisorResponse = new HypervisorResponse();
hypervisorResponse.setName(hypervisor);
hypervisorResponse.setResponseName("hypervisor");
hypervisorResponse.setObjectName("hypervisor");
responses.add(hypervisorResponse);
}

2
server/src/com/cloud/api/commands/ListIsosCmd.java
View File

@ -274,7 +274,7 @@ public class ListIsosCmd extends BaseListCmd {
isoResponse.setJobStatus(asyncJob.getStatus());
}
isoResponse.setResponseName("iso");
isoResponse.setObjectName("iso");
isoResponses.add(isoResponse);
}
}

2
server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java
View File

@ -76,7 +76,7 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
for (UserVmVO instance : instances) {
UserVmResponse userVmResponse = ApiResponseHelper.createUserVmResponse(instance);
userVmResponse.setResponseName("loadbalancerruleinstance");
userVmResponse.setObjectName("loadbalancerruleinstance");
vmResponses.add(userVmResponse);
}

2
server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java
View File

@ -105,7 +105,7 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd {
List<LoadBalancerResponse> lbResponses = new ArrayList<LoadBalancerResponse>();
for (LoadBalancerVO loadBalancer : loadBalancers) {
LoadBalancerResponse lbResponse = ApiResponseHelper.createLoadBalancerResponse(loadBalancer);
lbResponse.setResponseName("loadbalancerrule");
lbResponse.setObjectName("loadbalancerrule");
lbResponses.add(lbResponse);
}

4
server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java
View File

@ -126,12 +126,12 @@ public class ListNetworkGroupsCmd extends BaseListCmd {
ingressData.setCidr(ingressRule.getAllowedSourceIpCidr());
}
ingressData.setResponseName("ingressrule");
ingressData.setObjectName("ingressrule");
ingressRulesResponse.add(ingressData);
}
netGrpResponse.setIngressRules(ingressRulesResponse);
}
netGrpResponse.setResponseName("networkgroup");
netGrpResponse.setObjectName("securitygroup");
netGrpResponses.add(netGrpResponse);
}

2
server/src/com/cloud/api/commands/ListPodsByCmd.java
View File

@ -85,7 +85,7 @@ public class ListPodsByCmd extends BaseListCmd {
List<PodResponse> podResponses = new ArrayList<PodResponse>();
for (HostPodVO pod : pods) {
PodResponse podResponse = ApiResponseHelper.createPodResponse(pod);
podResponse.setResponseName("pod");
podResponse.setObjectName("pod");
podResponses.add(podResponse);
}

2
server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
View File

@ -70,7 +70,7 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
for (FirewallRuleVO fwRule : firewallRules) {
FirewallRuleResponse ruleData = ApiResponseHelper.createFirewallRuleResponse(fwRule);
ruleData.setResponseName("portforwardingrule");
ruleData.setObjectName("portforwardingrule");
fwResponses.add(ruleData);
}

2
server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java
View File

@ -80,7 +80,7 @@ public class ListPreallocatedLunsCmd extends BaseListCmd {
for (PreallocatedLunVO preallocatedLun : preallocatedLuns) {
PreallocatedLunResponse preallocLunResponse = ApiResponseHelper.createPreallocatedLunResponse(preallocatedLun);
preallocLunResponse.setResponseName("preallocatedlun");
preallocLunResponse.setObjectName("preallocatedlun");
lunResponses.add(preallocLunResponse);
}

2
server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
View File

@ -112,7 +112,7 @@ public class ListPublicIpAddressesCmd extends BaseListCmd {
List<IPAddressResponse> ipAddrResponses = new ArrayList<IPAddressResponse>();
for (IPAddressVO ipAddress : ipAddresses) {
IPAddressResponse ipResponse = ApiResponseHelper.createIPAddressResponse(ipAddress);
ipResponse.setResponseName("publicipaddress");
ipResponse.setObjectName("publicipaddress");
ipAddrResponses.add(ipResponse);
}

2
server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
View File

@ -78,7 +78,7 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
snapSchedResponse.setSnapshotPolicyId(snapshotSchedule.getPolicyId());
snapSchedResponse.setScheduled(snapshotSchedule.getScheduledTimestamp());
snapSchedResponse.setResponseName("snapshot");
snapSchedResponse.setObjectName("snapshot");
snapshotScheduleResponses.add(snapSchedResponse);
}

2
server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java
View File

@ -118,7 +118,7 @@ public class ListRemoteAccessVpnsCmd extends BaseListCmd {
vpnResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
vpnResponse.setResponseName("remoteaccessvpn");
vpnResponse.setObjectName("remoteaccessvpn");
vpnResponses.add(vpnResponse);
}

2
server/src/com/cloud/api/commands/ListResourceLimitsCmd.java
View File

@ -96,7 +96,7 @@ public class ListResourceLimitsCmd extends BaseListCmd {
List<ResourceLimitResponse> limitResponses = new ArrayList<ResourceLimitResponse>();
for (ResourceLimitVO limit : limits) {
ResourceLimitResponse resourceLimitResponse = ApiResponseHelper.createResourceLimitResponse(limit);
resourceLimitResponse.setResponseName("resourcelimit");
resourceLimitResponse.setObjectName("resourcelimit");
limitResponses.add(resourceLimitResponse);
}

2
server/src/com/cloud/api/commands/ListRoutersCmd.java
View File

@ -111,7 +111,7 @@ public class ListRoutersCmd extends BaseListCmd {
List<DomainRouterResponse> routerResponses = new ArrayList<DomainRouterResponse>();
for (DomainRouter router : routers) {
DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router);
routerResponse.setResponseName("router");
routerResponse.setObjectName("router");
routerResponses.add(routerResponse);
}

2
server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java
View File

@ -83,7 +83,7 @@ public class ListServiceOfferingsCmd extends BaseListCmd {
List<ServiceOfferingResponse> offeringResponses = new ArrayList<ServiceOfferingResponse>();
for (ServiceOfferingVO offering : offerings) {
ServiceOfferingResponse offeringResponse = ApiResponseHelper.createServiceOfferingResponse(offering);
offeringResponse.setResponseName("serviceoffering");
offeringResponse.setObjectName("serviceoffering");
offeringResponses.add(offeringResponse);
}

2
server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java
View File

@ -85,7 +85,7 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd {
List<SnapshotPolicyResponse> policyResponses = new ArrayList<SnapshotPolicyResponse>();
for (SnapshotPolicyVO policy : policies) {
SnapshotPolicyResponse policyResponse = ApiResponseHelper.createSnapshotPolicyResponse(policy);
policyResponse.setResponseName("snapshotpolicy");
policyResponse.setObjectName("snapshotpolicy");
policyResponses.add(policyResponse);
}

2
server/src/com/cloud/api/commands/ListSnapshotsCmd.java
View File

@ -112,7 +112,7 @@ public class ListSnapshotsCmd extends BaseListCmd {
List<SnapshotResponse> snapshotResponses = new ArrayList<SnapshotResponse>();
for (Snapshot snapshot : snapshots) {
SnapshotResponse snapshotResponse = ApiResponseHelper.createSnapshotResponse(snapshot);
snapshotResponse.setResponseName("snapshot");
snapshotResponse.setObjectName("snapshot");
snapshotResponses.add(snapshotResponse);
}

2
server/src/com/cloud/api/commands/ListStoragePoolsCmd.java
View File

@ -105,7 +105,7 @@ public class ListStoragePoolsCmd extends BaseListCmd {
List<StoragePoolResponse> poolResponses = new ArrayList<StoragePoolResponse>();
for (StoragePoolVO pool : pools) {
StoragePoolResponse poolResponse = ApiResponseHelper.createStoragePoolResponse(pool);
poolResponse.setResponseName("storagepool");
poolResponse.setObjectName("storagepool");
poolResponses.add(poolResponse);
}

2
server/src/com/cloud/api/commands/ListSystemVMsCmd.java
View File

@ -110,7 +110,7 @@ public class ListSystemVMsCmd extends BaseListCmd {
List<SystemVmResponse> vmResponses = new ArrayList<SystemVmResponse>();
for (VMInstanceVO systemVM : systemVMs) {
SystemVmResponse vmResponse = ApiResponseHelper.createSystemVmResponse(systemVM);
vmResponse.setResponseName("systemvm");
vmResponse.setObjectName("systemvm");
vmResponses.add(vmResponse);
}

8
server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java
View File

@ -34,7 +34,7 @@ import com.cloud.user.UserContext;
@Implementation(method="listTemplatePermissions", description="List template visibility and all accounts that have permissions to view this template.")
public class ListTemplateOrIsoPermissionsCmd extends BaseListCmd {
public Logger s_logger = getLogger();
protected String s_name = getResponseName();
protected String s_name = "listtemplatepermissionsresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -97,7 +97,7 @@ public class ListTemplateOrIsoPermissionsCmd extends BaseListCmd {
}
response.setAccountNames(accountNames);
response.setObjectName("templatepermission");
response.setResponseName(getName());
return response;
}
@ -106,10 +106,6 @@ public class ListTemplateOrIsoPermissionsCmd extends BaseListCmd {
return true;
}
protected String getResponseName() {
return "updatetemplateorisopermissionsresponse";
}
public String getMediaType() {
return "templateOrIso";
}

2
server/src/com/cloud/api/commands/ListTemplatesCmd.java
View File

@ -240,7 +240,7 @@ public class ListTemplatesCmd extends BaseListCmd {
templateResponse.setJobStatus(asyncJob.getStatus());
}
templateResponse.setResponseName("template");
templateResponse.setObjectName("template");
templateResponses.add(templateResponse);
}
}

2
server/src/com/cloud/api/commands/ListUsersCmd.java
View File

@ -105,7 +105,7 @@ public class ListUsersCmd extends BaseListCmd {
List<UserResponse> userResponses = new ArrayList<UserResponse>();
for (UserAccountVO user : users) {
UserResponse userResponse = ApiResponseHelper.createUserResponse(user);
userResponse.setResponseName("user");
userResponse.setObjectName("user");
userResponses.add(userResponse);
}
response.setResponses(userResponses);

2
server/src/com/cloud/api/commands/ListVMGroupsCmd.java
View File

@ -90,7 +90,7 @@ public class ListVMGroupsCmd extends BaseListCmd {
List<InstanceGroupResponse> responses = new ArrayList<InstanceGroupResponse>();
for (InstanceGroupVO group : groups) {
InstanceGroupResponse groupResponse = ApiResponseHelper.createInstanceGroupResponse(group);
groupResponse.setResponseName("instancegroup");
groupResponse.setObjectName("instancegroup");
responses.add(groupResponse);
}

2
server/src/com/cloud/api/commands/ListVMsCmd.java
View File

@ -126,7 +126,7 @@ public class ListVMsCmd extends BaseListCmd {
for (UserVm userVm : userVms) {
UserVmResponse userVmResponse = ApiResponseHelper.createUserVmResponse(userVm);
if (userVmResponse != null) {
userVmResponse.setResponseName("virtualmachine");
userVmResponse.setObjectName("virtualmachine");
vmResponses.add(userVmResponse);
}
}

2
server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java
View File

@ -104,7 +104,7 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
List<VlanIpRangeResponse> vlanResponses = new ArrayList<VlanIpRangeResponse>();
for (VlanVO vlan : vlans) {
VlanIpRangeResponse vlanResponse = ApiResponseHelper.createVlanIpRangeResponse(vlan);
vlanResponse.setResponseName("vlaniprange");
vlanResponse.setObjectName("vlaniprange");
vlanResponses.add(vlanResponse);
}

2
server/src/com/cloud/api/commands/ListVolumesCmd.java
View File

@ -125,7 +125,7 @@ public class ListVolumesCmd extends BaseListCmd {
List<VolumeResponse> volResponses = new ArrayList<VolumeResponse>();
for (VolumeVO volume : volumes) {
VolumeResponse volResponse = ApiResponseHelper.createVolumeResponse(volume);
volResponse.setResponseName("volume");
volResponse.setObjectName("volume");
volResponses.add(volResponse);
}

2
server/src/com/cloud/api/commands/ListVpnUsersCmd.java
View File

@ -101,7 +101,7 @@ public class ListVpnUsersCmd extends BaseListCmd {
vpnResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
vpnResponse.setResponseName("vpnuser");
vpnResponse.setObjectName("vpnuser");
vpnResponses.add(vpnResponse);
}

2
server/src/com/cloud/api/commands/ListZonesByCmd.java
View File

@ -75,7 +75,7 @@ public class ListZonesByCmd extends BaseListCmd {
List<ZoneResponse> zoneResponses = new ArrayList<ZoneResponse>();
for (DataCenterVO dataCenter : dataCenters) {
ZoneResponse zoneResponse = ApiResponseHelper.createZoneResponse(dataCenter);
zoneResponse.setResponseName("zone");
zoneResponse.setObjectName("zone");
zoneResponses.add(zoneResponse);
}

2
server/src/com/cloud/api/commands/RebootSystemVmCmd.java
View File

@ -86,7 +86,7 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
public SystemVmResponse getResponse() {
VMInstanceVO instance = (VMInstanceVO)getResponseObject();
SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance);
response.setResponseName("systemvm");
response.setResponseName(getName());
return response;
}
}

2
server/src/com/cloud/api/commands/RebootVMCmd.java
View File

@ -85,7 +85,7 @@ public class RebootVMCmd extends BaseAsyncCmd {
public UserVmResponse getResponse() {
UserVm userVm = (UserVm)getResponseObject();
UserVmResponse recoverVmResponse = ApiResponseHelper.createUserVmResponse(userVm);
recoverVmResponse.setResponseName("virtualmachine");
recoverVmResponse.setResponseName(getName());
return recoverVmResponse;
}
}

2
server/src/com/cloud/api/commands/ReconnectHostCmd.java
View File

@ -90,7 +90,7 @@ public class ReconnectHostCmd extends BaseAsyncCmd {
public HostResponse getResponse() {
HostVO host = (HostVO)getResponseObject();
HostResponse response = ApiResponseHelper.createHostResponse(host);
response.setResponseName("host");
response.setResponseName(getName());
return response;
}

2
server/src/com/cloud/api/commands/RegisterCmd.java
View File

@ -63,7 +63,7 @@ public class RegisterCmd extends BaseCmd {
RegisterResponse response = new RegisterResponse();
response.setApiKey(keys[0]);
response.setSecretKey(keys[1]);
response.setObjectName("userkeys");
response.setResponseName(getName());
return response;
}

2
server/src/com/cloud/api/commands/RegisterIsoCmd.java
View File

@ -157,7 +157,7 @@ public class RegisterIsoCmd extends BaseCmd {
templateResponse.setZoneId(zone.getId());
templateResponse.setZoneName(zone.getName());
templateResponse.setResponseName("iso");
templateResponse.setObjectName("iso");
responses.add(templateResponse);
}

2
server/src/com/cloud/api/commands/RegisterTemplateCmd.java
View File

@ -197,7 +197,7 @@ public class RegisterTemplateCmd extends BaseCmd {
templateResponse.setZoneId(zone.getId());
templateResponse.setZoneName(zone.getName());
templateResponse.setHypervisor(template.getHypervisorType().toString());
templateResponse.setResponseName("template");
templateResponse.setObjectName("template");
responses.add(templateResponse);
}

12
server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java
View File

@ -25,8 +25,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCmd;
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.SuccessResponse;
import com.cloud.event.EventTypes;
import com.cloud.network.LoadBalancerVO;
@ -105,10 +107,10 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd {
@Override @SuppressWarnings("unchecked")
public SuccessResponse getResponse() {
Boolean success = (Boolean)getResponseObject();
SuccessResponse response = new SuccessResponse();
response.setSuccess(success);
response.setResponseName("success");
return response;
if ((Boolean)getResponseObject()) {
return new SuccessResponse();
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to remove instance from load balancer rule");
}
}
}

Some files were not shown because too many files have changed in this diff Show More