diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 0e83aeb4390..1ef2e2bfb15 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -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 diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 4094fbdef70..b2df2b529d4 100644 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -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; } diff --git a/server/src/com/cloud/api/ResponseObject.java b/server/src/com/cloud/api/ResponseObject.java index c5123c1a632..6c92b9fd5ed 100644 --- a/server/src/com/cloud/api/ResponseObject.java +++ b/server/src/com/cloud/api/ResponseObject.java @@ -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); } diff --git a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java b/server/src/com/cloud/api/ResponseObjectTypeAdapter.java index f41aed61c2a..5b1e5afbf7e 100644 --- a/server/src/com/cloud/api/ResponseObjectTypeAdapter.java +++ b/server/src/com/cloud/api/ResponseObjectTypeAdapter.java @@ -17,8 +17,7 @@ import com.google.gson.JsonSerializer; import com.google.gson.annotations.SerializedName; public class ResponseObjectTypeAdapter implements JsonSerializer { - 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 } } JsonObject response = new JsonObject(); - response.add(responseObj.getResponseName(), obj); + response.add(responseObj.getObjectName(), obj); return response; } } diff --git a/server/src/com/cloud/api/commands/AddHostCmd.java b/server/src/com/cloud/api/commands/AddHostCmd.java index 60711f25d75..9a990cda8d5 100644 --- a/server/src/com/cloud/api/commands/AddHostCmd.java +++ b/server/src/com/cloud/api/commands/AddHostCmd.java @@ -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 { diff --git a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java index 74513c7be08..8995a669544 100644 --- a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java +++ b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java @@ -71,24 +71,20 @@ public class AddSecondaryStorageCmd extends BaseCmd { } @Override @SuppressWarnings("unchecked") - public ListResponse getResponse() { + public HostResponse getResponse() { List hosts = (List)getResponseObject(); - - ListResponse response = new ListResponse(); - List hostResponses = new ArrayList(); - 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; } } diff --git a/server/src/com/cloud/api/commands/AddVpnUserCmd.java b/server/src/com/cloud/api/commands/AddVpnUserCmd.java index 55107fc1a27..96d2595344d 100644 --- a/server/src/com/cloud/api/commands/AddVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/AddVpnUserCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/AttachIsoCmd.java b/server/src/com/cloud/api/commands/AttachIsoCmd.java index 5219fe79e98..e4ee987dccd 100755 --- a/server/src/com/cloud/api/commands/AttachIsoCmd.java +++ b/server/src/com/cloud/api/commands/AttachIsoCmd.java @@ -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"); diff --git a/server/src/com/cloud/api/commands/AttachVolumeCmd.java b/server/src/com/cloud/api/commands/AttachVolumeCmd.java index c99cf7e1cff..eaaf17f3381 100755 --- a/server/src/com/cloud/api/commands/AttachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/AttachVolumeCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java index 388fa7c6d66..add03b13f02 100644 --- a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java index 7160608e80e..6b20209f775 100644 --- a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java index a4afcb8badb..4ae5126d1ec 100644 --- a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/CopyIsoCmd.java b/server/src/com/cloud/api/commands/CopyIsoCmd.java index 5903257a2b0..975e7bdb479 100644 --- a/server/src/com/cloud/api/commands/CopyIsoCmd.java +++ b/server/src/com/cloud/api/commands/CopyIsoCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/CopyTemplateCmd.java b/server/src/com/cloud/api/commands/CopyTemplateCmd.java index 4a5ddfbcf25..032b667712b 100644 --- a/server/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/AddConfigCmd.java b/server/src/com/cloud/api/commands/CreateCfgCmd.java similarity index 96% rename from server/src/com/cloud/api/commands/AddConfigCmd.java rename to server/src/com/cloud/api/commands/CreateCfgCmd.java index 33dd3ac8237..a3b347d2838 100644 --- a/server/src/com/cloud/api/commands/AddConfigCmd.java +++ b/server/src/com/cloud/api/commands/CreateCfgCmd.java @@ -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"; ///////////////////////////////////////////////////// diff --git a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java index 566158d7a99..aaf2411d308 100644 --- a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java index bd9aa58dd93..2cf4696ab92 100644 --- a/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java index ff56d9902b1..9b018b31696 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java index a8d5648994e..b7f3a82b6b9 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/CreateTemplateCmd.java b/server/src/com/cloud/api/commands/CreateTemplateCmd.java index da42b895285..77cc8c4ec8a 100644 --- a/server/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -211,7 +211,8 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { response.setZoneName(zone.getName()); } - response.setResponseName("template"); + response.setObjectName("template"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java index 6dcb43abb0b..1d189443438 100644 --- a/server/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java index 3bfb59696a3..0e01f9b9219 100644 --- a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/DeleteDomainCmd.java b/server/src/com/cloud/api/commands/DeleteDomainCmd.java index 964d44d8f2f..0920e023872 100644 --- a/server/src/com/cloud/api/commands/DeleteDomainCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDomainCmd.java @@ -100,7 +100,6 @@ public class DeleteDomainCmd extends BaseAsyncCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host"); } - response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/DeleteHostCmd.java b/server/src/com/cloud/api/commands/DeleteHostCmd.java index 6d3a9c8e5b7..40cbb409930 100644 --- a/server/src/com/cloud/api/commands/DeleteHostCmd.java +++ b/server/src/com/cloud/api/commands/DeleteHostCmd.java @@ -72,7 +72,6 @@ public class DeleteHostCmd extends BaseCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host"); } - response.setResponseName(getName()); return response; } } \ No newline at end of file diff --git a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java index 5324366308f..a0f198fc2c3 100644 --- a/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIPForwardingRuleCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteIsoCmd.java b/server/src/com/cloud/api/commands/DeleteIsoCmd.java index a763962d4f5..c69960443f8 100644 --- a/server/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -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 diff --git a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index 39b118e3cfc..835eb19ca1b 100644 --- a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java index b15b095dcf4..937e130494b 100644 --- a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeletePodCmd.java b/server/src/com/cloud/api/commands/DeletePodCmd.java index 6a971239940..7e9a82e2bcf 100644 --- a/server/src/com/cloud/api/commands/DeletePodCmd.java +++ b/server/src/com/cloud/api/commands/DeletePodCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeletePoolCmd.java b/server/src/com/cloud/api/commands/DeletePoolCmd.java index 07ed1c3a801..23ed463e5ac 100644 --- a/server/src/com/cloud/api/commands/DeletePoolCmd.java +++ b/server/src/com/cloud/api/commands/DeletePoolCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java index 46990347470..f46f7546c68 100644 --- a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java +++ b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java index de3c37ddaa2..e056d6555cf 100644 --- a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java @@ -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 diff --git a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java index e200ed334ff..6da8822afe5 100644 --- a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java index 35d162abc9f..703277dfd44 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java index c55712145f3..938b4a904ad 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java index 5811aa819bd..8afcc10cebd 100644 --- a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -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 diff --git a/server/src/com/cloud/api/commands/DeleteUserCmd.java b/server/src/com/cloud/api/commands/DeleteUserCmd.java index 4e7cec17efd..c4b1abdde1b 100644 --- a/server/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/server/src/com/cloud/api/commands/DeleteUserCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java index fbbe3814cc1..0bbc00a84bc 100644 --- a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java index 49d4ee382a2..0a368c18dd4 100644 --- a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java index 3b091bb0b99..4e45f94329f 100644 --- a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteZoneCmd.java b/server/src/com/cloud/api/commands/DeleteZoneCmd.java index 9e928980282..16b166a6844 100644 --- a/server/src/com/cloud/api/commands/DeleteZoneCmd.java +++ b/server/src/com/cloud/api/commands/DeleteZoneCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DeployVMCmd.java b/server/src/com/cloud/api/commands/DeployVMCmd.java index 92d4637d00c..903ab4789c7 100644 --- a/server/src/com/cloud/api/commands/DeployVMCmd.java +++ b/server/src/com/cloud/api/commands/DeployVMCmd.java @@ -196,7 +196,7 @@ public class DeployVMCmd extends BaseAsyncCmd { // if (templatePasswordEnabled) { // response.setPassword(getPassword()); // } - response.setResponseName("virtualmachine"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/DeployVm2Cmd.java b/server/src/com/cloud/api/commands/DeployVm2Cmd.java index fc3bb96f839..04ac0dba855 100644 --- a/server/src/com/cloud/api/commands/DeployVm2Cmd.java +++ b/server/src/com/cloud/api/commands/DeployVm2Cmd.java @@ -295,6 +295,7 @@ public class DeployVm2Cmd extends BaseAsyncCreateCmd { response.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId())); response.setResponseName(getName()); + response.setObjectName("virtualmachine"); return response; } } diff --git a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index 389c6c72e46..aafb6f89be2 100644 --- a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DetachIsoCmd.java b/server/src/com/cloud/api/commands/DetachIsoCmd.java index 741524485d3..fbbcdfb18df 100644 --- a/server/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/server/src/com/cloud/api/commands/DetachIsoCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/DisableAccountCmd.java b/server/src/com/cloud/api/commands/DisableAccountCmd.java index 7ff231f492f..1418451c3d8 100644 --- a/server/src/com/cloud/api/commands/DisableAccountCmd.java +++ b/server/src/com/cloud/api/commands/DisableAccountCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/DisableUserCmd.java b/server/src/com/cloud/api/commands/DisableUserCmd.java index 3403bf69ea6..af43617e06e 100644 --- a/server/src/com/cloud/api/commands/DisableUserCmd.java +++ b/server/src/com/cloud/api/commands/DisableUserCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java index 5b7f5f8edcf..4b51779a0a7 100644 --- a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/ExtractIsoCmd.java b/server/src/com/cloud/api/commands/ExtractIsoCmd.java index c84538ac08c..b9e8d661504 100755 --- a/server/src/com/cloud/api/commands/ExtractIsoCmd.java +++ b/server/src/com/cloud/api/commands/ExtractIsoCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java index 708ef548ccb..50a5e8aa4da 100755 --- a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java +++ b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java @@ -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); diff --git a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java index 3437fb07d2d..2371a5e2314 100755 --- a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -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); diff --git a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java index ab9a42e0189..b740a218711 100644 --- a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java +++ b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/ListAccountsCmd.java b/server/src/com/cloud/api/commands/ListAccountsCmd.java index c0213572154..9fc7605e19a 100644 --- a/server/src/com/cloud/api/commands/ListAccountsCmd.java +++ b/server/src/com/cloud/api/commands/ListAccountsCmd.java @@ -113,7 +113,7 @@ public class ListAccountsCmd extends BaseListCmd { List accountResponses = new ArrayList(); for (AccountVO account : accounts) { AccountResponse acctResponse = ApiResponseHelper.createAccountResponse(account); - acctResponse.setResponseName("account"); + acctResponse.setObjectName("account"); accountResponses.add(acctResponse); } diff --git a/server/src/com/cloud/api/commands/ListAlertsCmd.java b/server/src/com/cloud/api/commands/ListAlertsCmd.java index da341b554dc..7547d93a2f8 100644 --- a/server/src/com/cloud/api/commands/ListAlertsCmd.java +++ b/server/src/com/cloud/api/commands/ListAlertsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java index 770e4b13273..fbda1e962f7 100644 --- a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java +++ b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java b/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java index 0a2d6b2d04a..be7b7638999 100644 --- a/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java +++ b/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java @@ -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; diff --git a/server/src/com/cloud/api/commands/ListCapacityCmd.java b/server/src/com/cloud/api/commands/ListCapacityCmd.java index 13064a0cb64..9477babecfc 100644 --- a/server/src/com/cloud/api/commands/ListCapacityCmd.java +++ b/server/src/com/cloud/api/commands/ListCapacityCmd.java @@ -134,7 +134,7 @@ public class ListCapacityCmd extends BaseListCmd { capacityResponse.setPercentUsed(s_percentFormat.format(0L)); } - capacityResponse.setResponseName("capacity"); + capacityResponse.setObjectName("capacity"); capacityResponses.add(capacityResponse); } diff --git a/server/src/com/cloud/api/commands/ListCfgsByCmd.java b/server/src/com/cloud/api/commands/ListCfgsByCmd.java index 1949a5d237e..5eca326d5c1 100644 --- a/server/src/com/cloud/api/commands/ListCfgsByCmd.java +++ b/server/src/com/cloud/api/commands/ListCfgsByCmd.java @@ -79,7 +79,7 @@ public class ListCfgsByCmd extends BaseListCmd { List configResponses = new ArrayList(); for (ConfigurationVO cfg : configurations) { ConfigurationResponse cfgResponse = ApiResponseHelper.createConfigurationResponse(cfg); - cfgResponse.setResponseName("configuration"); + cfgResponse.setObjectName("configuration"); configResponses.add(cfgResponse); } diff --git a/server/src/com/cloud/api/commands/ListClustersCmd.java b/server/src/com/cloud/api/commands/ListClustersCmd.java index 4d95bf7ee5e..008be9ed0be 100644 --- a/server/src/com/cloud/api/commands/ListClustersCmd.java +++ b/server/src/com/cloud/api/commands/ListClustersCmd.java @@ -92,7 +92,7 @@ public class ListClustersCmd extends BaseListCmd { List clusterResponses = new ArrayList(); for (ClusterVO cluster : clusters) { ClusterResponse clusterResponse = ApiResponseHelper.createClusterResponse(cluster); - clusterResponse.setResponseName("cluster"); + clusterResponse.setObjectName("cluster"); clusterResponses.add(clusterResponse); } diff --git a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java index 0a8557111d1..583a0d0a4a2 100644 --- a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java @@ -83,7 +83,7 @@ public class ListDiskOfferingsCmd extends BaseListCmd { List diskOfferingResponses = new ArrayList(); for (DiskOfferingVO offering : offerings) { DiskOfferingResponse diskOffResp = ApiResponseHelper.createDiskOfferingResponse(offering); - diskOffResp.setResponseName("diskoffering"); + diskOffResp.setObjectName("diskoffering"); diskOfferingResponses.add(diskOffResp); } diff --git a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java index dfe4de2a2fb..22c0e8f79e0 100644 --- a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java @@ -83,7 +83,7 @@ public class ListDomainChildrenCmd extends BaseListCmd { List domainResponses = new ArrayList(); for (DomainVO domain : domains) { DomainResponse domainResponse = ApiResponseHelper.createDomainResponse(domain); - domainResponse.setResponseName("domain"); + domainResponse.setObjectName("domain"); domainResponses.add(domainResponse); } diff --git a/server/src/com/cloud/api/commands/ListDomainsCmd.java b/server/src/com/cloud/api/commands/ListDomainsCmd.java index 63a77f2a6e3..ffc8e7546fe 100644 --- a/server/src/com/cloud/api/commands/ListDomainsCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainsCmd.java @@ -83,7 +83,7 @@ public class ListDomainsCmd extends BaseListCmd { List domainResponses = new ArrayList(); for (DomainVO domain : domains) { DomainResponse domainResponse = ApiResponseHelper.createDomainResponse(domain); - domainResponse.setResponseName("domain"); + domainResponse.setObjectName("domain"); domainResponses.add(domainResponse); } diff --git a/server/src/com/cloud/api/commands/ListEventsCmd.java b/server/src/com/cloud/api/commands/ListEventsCmd.java index 6b9c464d0c7..2893ba25cca 100644 --- a/server/src/com/cloud/api/commands/ListEventsCmd.java +++ b/server/src/com/cloud/api/commands/ListEventsCmd.java @@ -135,7 +135,7 @@ public class ListEventsCmd extends BaseListCmd { responseEvent.setUsername(user.getUsername()); } - responseEvent.setResponseName("event"); + responseEvent.setObjectName("event"); eventResponses.add(responseEvent); } diff --git a/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java b/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java index a2ec785191d..76cfa7345a3 100644 --- a/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java +++ b/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListGuestOsCmd.java b/server/src/com/cloud/api/commands/ListGuestOsCmd.java index 33840d54dd4..bce94fabc36 100644 --- a/server/src/com/cloud/api/commands/ListGuestOsCmd.java +++ b/server/src/com/cloud/api/commands/ListGuestOsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListHostsCmd.java b/server/src/com/cloud/api/commands/ListHostsCmd.java index eebbae4bee3..8008a45fabb 100644 --- a/server/src/com/cloud/api/commands/ListHostsCmd.java +++ b/server/src/com/cloud/api/commands/ListHostsCmd.java @@ -114,7 +114,7 @@ public class ListHostsCmd extends BaseListCmd { List hostResponses = new ArrayList(); for (HostVO host : hosts) { HostResponse hostResponse = ApiResponseHelper.createHostResponse(host); - hostResponse.setResponseName("host"); + hostResponse.setObjectName("host"); hostResponses.add(hostResponse); } diff --git a/server/src/com/cloud/api/commands/ListHypervisorsCmd.java b/server/src/com/cloud/api/commands/ListHypervisorsCmd.java index 12ac6cd96e1..2e200ff80f1 100644 --- a/server/src/com/cloud/api/commands/ListHypervisorsCmd.java +++ b/server/src/com/cloud/api/commands/ListHypervisorsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListIsosCmd.java b/server/src/com/cloud/api/commands/ListIsosCmd.java index 11dc72e2aa8..5c770a1d048 100644 --- a/server/src/com/cloud/api/commands/ListIsosCmd.java +++ b/server/src/com/cloud/api/commands/ListIsosCmd.java @@ -274,7 +274,7 @@ public class ListIsosCmd extends BaseListCmd { isoResponse.setJobStatus(asyncJob.getStatus()); } - isoResponse.setResponseName("iso"); + isoResponse.setObjectName("iso"); isoResponses.add(isoResponse); } } diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java index cdbb8fc6db8..3eed08e0c36 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java @@ -76,7 +76,7 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd { List vmResponses = new ArrayList(); for (UserVmVO instance : instances) { UserVmResponse userVmResponse = ApiResponseHelper.createUserVmResponse(instance); - userVmResponse.setResponseName("loadbalancerruleinstance"); + userVmResponse.setObjectName("loadbalancerruleinstance"); vmResponses.add(userVmResponse); } diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java index 809d195a76e..5891827cf06 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java @@ -105,7 +105,7 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd { List lbResponses = new ArrayList(); for (LoadBalancerVO loadBalancer : loadBalancers) { LoadBalancerResponse lbResponse = ApiResponseHelper.createLoadBalancerResponse(loadBalancer); - lbResponse.setResponseName("loadbalancerrule"); + lbResponse.setObjectName("loadbalancerrule"); lbResponses.add(lbResponse); } diff --git a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java index d80b00408ce..e85b7fe615b 100644 --- a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListPodsByCmd.java b/server/src/com/cloud/api/commands/ListPodsByCmd.java index 57e306b01a3..e17b16cb2c6 100644 --- a/server/src/com/cloud/api/commands/ListPodsByCmd.java +++ b/server/src/com/cloud/api/commands/ListPodsByCmd.java @@ -85,7 +85,7 @@ public class ListPodsByCmd extends BaseListCmd { List podResponses = new ArrayList(); for (HostPodVO pod : pods) { PodResponse podResponse = ApiResponseHelper.createPodResponse(pod); - podResponse.setResponseName("pod"); + podResponse.setObjectName("pod"); podResponses.add(podResponse); } diff --git a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java index 433fac2f513..52a9264b288 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java index d7d94e2e537..470c72d9371 100644 --- a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java +++ b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java index 779329b28aa..27eff8bbb19 100644 --- a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java +++ b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java @@ -112,7 +112,7 @@ public class ListPublicIpAddressesCmd extends BaseListCmd { List ipAddrResponses = new ArrayList(); for (IPAddressVO ipAddress : ipAddresses) { IPAddressResponse ipResponse = ApiResponseHelper.createIPAddressResponse(ipAddress); - ipResponse.setResponseName("publicipaddress"); + ipResponse.setObjectName("publicipaddress"); ipAddrResponses.add(ipResponse); } diff --git a/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java index e00cd976907..b0afb70feb0 100644 --- a/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java +++ b/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java b/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java index fe01cdf098b..48a4d704042 100644 --- a/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java +++ b/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java index f1982d1094c..b4cce7b1544 100644 --- a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java +++ b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java @@ -96,7 +96,7 @@ public class ListResourceLimitsCmd extends BaseListCmd { List limitResponses = new ArrayList(); for (ResourceLimitVO limit : limits) { ResourceLimitResponse resourceLimitResponse = ApiResponseHelper.createResourceLimitResponse(limit); - resourceLimitResponse.setResponseName("resourcelimit"); + resourceLimitResponse.setObjectName("resourcelimit"); limitResponses.add(resourceLimitResponse); } diff --git a/server/src/com/cloud/api/commands/ListRoutersCmd.java b/server/src/com/cloud/api/commands/ListRoutersCmd.java index 7efa509059e..46f556c1534 100644 --- a/server/src/com/cloud/api/commands/ListRoutersCmd.java +++ b/server/src/com/cloud/api/commands/ListRoutersCmd.java @@ -111,7 +111,7 @@ public class ListRoutersCmd extends BaseListCmd { List routerResponses = new ArrayList(); for (DomainRouter router : routers) { DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router); - routerResponse.setResponseName("router"); + routerResponse.setObjectName("router"); routerResponses.add(routerResponse); } diff --git a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java index b395cf7ca23..783425ecc9c 100644 --- a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java @@ -83,7 +83,7 @@ public class ListServiceOfferingsCmd extends BaseListCmd { List offeringResponses = new ArrayList(); for (ServiceOfferingVO offering : offerings) { ServiceOfferingResponse offeringResponse = ApiResponseHelper.createServiceOfferingResponse(offering); - offeringResponse.setResponseName("serviceoffering"); + offeringResponse.setObjectName("serviceoffering"); offeringResponses.add(offeringResponse); } diff --git a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java index 47f22621381..82f3a2d31b9 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java @@ -85,7 +85,7 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd { List policyResponses = new ArrayList(); for (SnapshotPolicyVO policy : policies) { SnapshotPolicyResponse policyResponse = ApiResponseHelper.createSnapshotPolicyResponse(policy); - policyResponse.setResponseName("snapshotpolicy"); + policyResponse.setObjectName("snapshotpolicy"); policyResponses.add(policyResponse); } diff --git a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java index 7078852dff2..abca4af2094 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java @@ -112,7 +112,7 @@ public class ListSnapshotsCmd extends BaseListCmd { List snapshotResponses = new ArrayList(); for (Snapshot snapshot : snapshots) { SnapshotResponse snapshotResponse = ApiResponseHelper.createSnapshotResponse(snapshot); - snapshotResponse.setResponseName("snapshot"); + snapshotResponse.setObjectName("snapshot"); snapshotResponses.add(snapshotResponse); } diff --git a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java index a91367cb614..3554353d608 100644 --- a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java +++ b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java @@ -105,7 +105,7 @@ public class ListStoragePoolsCmd extends BaseListCmd { List poolResponses = new ArrayList(); for (StoragePoolVO pool : pools) { StoragePoolResponse poolResponse = ApiResponseHelper.createStoragePoolResponse(pool); - poolResponse.setResponseName("storagepool"); + poolResponse.setObjectName("storagepool"); poolResponses.add(poolResponse); } diff --git a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java index ae3130e07ac..cc3166ca5fa 100644 --- a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java @@ -110,7 +110,7 @@ public class ListSystemVMsCmd extends BaseListCmd { List vmResponses = new ArrayList(); for (VMInstanceVO systemVM : systemVMs) { SystemVmResponse vmResponse = ApiResponseHelper.createSystemVmResponse(systemVM); - vmResponse.setResponseName("systemvm"); + vmResponse.setObjectName("systemvm"); vmResponses.add(vmResponse); } diff --git a/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java index 3addabc8c5a..25cd2918f04 100644 --- a/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java @@ -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"; } diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index 3ba2ca5e9fc..39dfa87e2bb 100644 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -240,7 +240,7 @@ public class ListTemplatesCmd extends BaseListCmd { templateResponse.setJobStatus(asyncJob.getStatus()); } - templateResponse.setResponseName("template"); + templateResponse.setObjectName("template"); templateResponses.add(templateResponse); } } diff --git a/server/src/com/cloud/api/commands/ListUsersCmd.java b/server/src/com/cloud/api/commands/ListUsersCmd.java index ee08e971d8d..037c9dbd40d 100644 --- a/server/src/com/cloud/api/commands/ListUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListUsersCmd.java @@ -105,7 +105,7 @@ public class ListUsersCmd extends BaseListCmd { List userResponses = new ArrayList(); for (UserAccountVO user : users) { UserResponse userResponse = ApiResponseHelper.createUserResponse(user); - userResponse.setResponseName("user"); + userResponse.setObjectName("user"); userResponses.add(userResponse); } response.setResponses(userResponses); diff --git a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java index 3678d092a93..219c72f44c5 100644 --- a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java @@ -90,7 +90,7 @@ public class ListVMGroupsCmd extends BaseListCmd { List responses = new ArrayList(); for (InstanceGroupVO group : groups) { InstanceGroupResponse groupResponse = ApiResponseHelper.createInstanceGroupResponse(group); - groupResponse.setResponseName("instancegroup"); + groupResponse.setObjectName("instancegroup"); responses.add(groupResponse); } diff --git a/server/src/com/cloud/api/commands/ListVMsCmd.java b/server/src/com/cloud/api/commands/ListVMsCmd.java index 143e32fd9ff..5cc0ba144d9 100644 --- a/server/src/com/cloud/api/commands/ListVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMsCmd.java @@ -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); } } diff --git a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java index 359e6358c9d..19caf919b59 100644 --- a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java +++ b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java @@ -104,7 +104,7 @@ public class ListVlanIpRangesCmd extends BaseListCmd { List vlanResponses = new ArrayList(); for (VlanVO vlan : vlans) { VlanIpRangeResponse vlanResponse = ApiResponseHelper.createVlanIpRangeResponse(vlan); - vlanResponse.setResponseName("vlaniprange"); + vlanResponse.setObjectName("vlaniprange"); vlanResponses.add(vlanResponse); } diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java index e0aa11f2bea..4fd2e5dfda6 100755 --- a/server/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java @@ -125,7 +125,7 @@ public class ListVolumesCmd extends BaseListCmd { List volResponses = new ArrayList(); for (VolumeVO volume : volumes) { VolumeResponse volResponse = ApiResponseHelper.createVolumeResponse(volume); - volResponse.setResponseName("volume"); + volResponse.setObjectName("volume"); volResponses.add(volResponse); } diff --git a/server/src/com/cloud/api/commands/ListVpnUsersCmd.java b/server/src/com/cloud/api/commands/ListVpnUsersCmd.java index 07c9fdddca5..01deb3917f7 100644 --- a/server/src/com/cloud/api/commands/ListVpnUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListVpnUsersCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/ListZonesByCmd.java b/server/src/com/cloud/api/commands/ListZonesByCmd.java index 8894aa0d5bc..2b9fc887b65 100644 --- a/server/src/com/cloud/api/commands/ListZonesByCmd.java +++ b/server/src/com/cloud/api/commands/ListZonesByCmd.java @@ -75,7 +75,7 @@ public class ListZonesByCmd extends BaseListCmd { List zoneResponses = new ArrayList(); for (DataCenterVO dataCenter : dataCenters) { ZoneResponse zoneResponse = ApiResponseHelper.createZoneResponse(dataCenter); - zoneResponse.setResponseName("zone"); + zoneResponse.setObjectName("zone"); zoneResponses.add(zoneResponse); } diff --git a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java index 63d8ff4c216..7f8ec0629c2 100644 --- a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/RebootVMCmd.java b/server/src/com/cloud/api/commands/RebootVMCmd.java index bc05e21f217..ab407b31782 100644 --- a/server/src/com/cloud/api/commands/RebootVMCmd.java +++ b/server/src/com/cloud/api/commands/RebootVMCmd.java @@ -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; } } diff --git a/server/src/com/cloud/api/commands/ReconnectHostCmd.java b/server/src/com/cloud/api/commands/ReconnectHostCmd.java index 9b706f2e8c2..002eca30f9b 100644 --- a/server/src/com/cloud/api/commands/ReconnectHostCmd.java +++ b/server/src/com/cloud/api/commands/ReconnectHostCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/RegisterCmd.java b/server/src/com/cloud/api/commands/RegisterCmd.java index 5e07d02e0b0..1af41834a03 100644 --- a/server/src/com/cloud/api/commands/RegisterCmd.java +++ b/server/src/com/cloud/api/commands/RegisterCmd.java @@ -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; } diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java index 14e03a49ce0..786aa88263a 100755 --- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java index 5d2b51de46e..9e11f7c8bc9 100755 --- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -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); } diff --git a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index 49ac99decd7..c13aa7e50d9 100644 --- a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -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"); + } } } diff --git a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java index 05ac1337738..31676018b19 100644 --- a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java @@ -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.RemoteAccessVpnResponse; import com.cloud.api.response.SuccessResponse; import com.cloud.event.EventTypes; @@ -84,11 +86,11 @@ public class RemoveVpnUserCmd 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 vpn user"); + } } @Override diff --git a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java index 0f5ceda7900..a445c087bca 100644 --- a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java +++ b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java @@ -104,7 +104,7 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd { // if (templatePasswordEnabled) { // response.setPassword(getPassword()); // } - response.setResponseName("virtualmachine"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index 5e6a1e3318c..6ba9169f5b7 100644 --- a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -10,8 +10,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.security.NetworkGroupManager; @@ -180,10 +182,10 @@ public class RevokeNetworkGroupIngressCmd 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 revoke security group ingress rule"); + } } } diff --git a/server/src/com/cloud/api/commands/StartRouterCmd.java b/server/src/com/cloud/api/commands/StartRouterCmd.java index a0e4fc9b167..8f19bc1e138 100644 --- a/server/src/com/cloud/api/commands/StartRouterCmd.java +++ b/server/src/com/cloud/api/commands/StartRouterCmd.java @@ -92,7 +92,7 @@ public class StartRouterCmd extends BaseAsyncCmd { public DomainRouterResponse getResponse() { DomainRouter router = (DomainRouter)getResponseObject(); DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router); - routerResponse.setResponseName("router"); + routerResponse.setResponseName(getName()); return routerResponse; } } diff --git a/server/src/com/cloud/api/commands/StartSystemVMCmd.java b/server/src/com/cloud/api/commands/StartSystemVMCmd.java index b37edd4e868..ea9f480fe05 100644 --- a/server/src/com/cloud/api/commands/StartSystemVMCmd.java +++ b/server/src/com/cloud/api/commands/StartSystemVMCmd.java @@ -90,7 +90,7 @@ public class StartSystemVMCmd extends BaseAsyncCmd { public SystemVmResponse getResponse() { VMInstanceVO instance = (VMInstanceVO)getResponseObject(); SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance); - response.setResponseName("systemvm"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/StartVMCmd.java b/server/src/com/cloud/api/commands/StartVMCmd.java index 0ff196583c6..8de866250f0 100644 --- a/server/src/com/cloud/api/commands/StartVMCmd.java +++ b/server/src/com/cloud/api/commands/StartVMCmd.java @@ -89,7 +89,7 @@ public class StartVMCmd extends BaseAsyncCmd { public UserVmResponse getResponse() { UserVm userVm = (UserVm)getResponseObject(); UserVmResponse recoverVmResponse = ApiResponseHelper.createUserVmResponse(userVm); - recoverVmResponse.setResponseName("virtualmachine"); + recoverVmResponse.setResponseName(getName()); return recoverVmResponse; } } diff --git a/server/src/com/cloud/api/commands/StartVm2Cmd.java b/server/src/com/cloud/api/commands/StartVm2Cmd.java index e664ccb5771..269561a280b 100644 --- a/server/src/com/cloud/api/commands/StartVm2Cmd.java +++ b/server/src/com/cloud/api/commands/StartVm2Cmd.java @@ -186,7 +186,7 @@ public class StartVm2Cmd extends BaseAsyncCmd { //Network groups response.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(vm.getId())); - + response.setObjectName("virtualmachine"); response.setResponseName(getName()); //response.setResponseName(getResultObjectName()); return response; diff --git a/server/src/com/cloud/api/commands/StopRouterCmd.java b/server/src/com/cloud/api/commands/StopRouterCmd.java index 0631d2d33f5..5e8eb0a1d0b 100644 --- a/server/src/com/cloud/api/commands/StopRouterCmd.java +++ b/server/src/com/cloud/api/commands/StopRouterCmd.java @@ -87,7 +87,7 @@ public class StopRouterCmd extends BaseAsyncCmd { public DomainRouterResponse getResponse() { DomainRouter router = (DomainRouter)getResponseObject(); DomainRouterResponse response =ApiResponseHelper.createDomainRouterResponse(router); - response.setResponseName("router"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/StopSystemVmCmd.java b/server/src/com/cloud/api/commands/StopSystemVmCmd.java index 01a59af8ad2..e0f1f11492c 100644 --- a/server/src/com/cloud/api/commands/StopSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/StopSystemVmCmd.java @@ -86,7 +86,7 @@ public class StopSystemVmCmd extends BaseAsyncCmd { public SystemVmResponse getResponse() { VMInstanceVO instance = (VMInstanceVO)getResponseObject(); SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance); - response.setResponseName("systemvm"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/StopVMCmd.java b/server/src/com/cloud/api/commands/StopVMCmd.java index 46d084fe8da..f5308f29925 100644 --- a/server/src/com/cloud/api/commands/StopVMCmd.java +++ b/server/src/com/cloud/api/commands/StopVMCmd.java @@ -89,7 +89,7 @@ public class StopVMCmd extends BaseAsyncCmd { public UserVmResponse getResponse() { UserVm userVm = (UserVm)getResponseObject(); UserVmResponse recoverVmResponse = ApiResponseHelper.createUserVmResponse(userVm); - recoverVmResponse.setResponseName("virtualmachine"); + recoverVmResponse.setResponseName(getName()); return recoverVmResponse; } } diff --git a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java index cae51852800..1e0cb77e459 100644 --- a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java @@ -104,7 +104,7 @@ public class UpdateIPForwardingRuleCmd extends BaseAsyncCmd { public FirewallRuleResponse getResponse() { FirewallRuleVO fwRule = (FirewallRuleVO)getResponseObject(); FirewallRuleResponse response = ApiResponseHelper.createFirewallRuleResponse(fwRule); - response.setResponseName("portforwardingrule"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/UpdateIsoCmd.java b/server/src/com/cloud/api/commands/UpdateIsoCmd.java index 7dc6146729a..d313d6ae560 100755 --- a/server/src/com/cloud/api/commands/UpdateIsoCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIsoCmd.java @@ -65,7 +65,7 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd { response.setFormat(responseObject.getFormat()); response.setOsTypeId(responseObject.getGuestOSId()); response.setBootable(responseObject.isBootable()); - + response.setObjectName("iso"); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update iso"); } diff --git a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java index 8c9ebb7e0e5..859ee394c9c 100644 --- a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java @@ -111,7 +111,7 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCmd { public LoadBalancerResponse getResponse() { LoadBalancerVO loadBalancer = (LoadBalancerVO)getResponseObject(); LoadBalancerResponse response = ApiResponseHelper.createLoadBalancerResponse(loadBalancer); - response.setResponseName("loadbalancerrule"); + response.setResponseName(getName()); return response; } } diff --git a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java index 66b5297786f..b51c7e3c91b 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java @@ -62,6 +62,7 @@ public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd { response.setOsTypeId(responseObject.getGuestOSId()); response.setPasswordEnabled(responseObject.getEnablePassword()); response.setCrossZones(responseObject.isCrossZones()); + response.setObjectName("template"); } else { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update template"); } diff --git a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java index e6a6069ef64..e6de26db851 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java @@ -8,6 +8,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.server.ManagementServer; @@ -80,10 +81,10 @@ public abstract class UpdateTemplateOrIsoPermissionsCmd extends BaseCmd { @Override @SuppressWarnings("unchecked") public SuccessResponse getResponse() { - Boolean success = (Boolean)getResponseObject(); - SuccessResponse response = new SuccessResponse(); - response.setSuccess(success); - response.setResponseName(getResponseName()); - return response; + if ((Boolean)getResponseObject()) { + return new SuccessResponse(); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update template permissions"); + } } } diff --git a/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java index 2751d915e8e..afbc3ed77f3 100644 --- a/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java @@ -44,8 +44,9 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd { public CustomCertificateResponse getResponse() { String updatedCpIdList = (String)getResponseObject(); CustomCertificateResponse response = new CustomCertificateResponse(); - response.setResponseName("customcertificate"); + response.setResponseName(getName()); response.setUpdatedConsoleProxyIdList(updatedCpIdList); + response.setObjectName("customcertificate"); return response; } diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java index 91adce37784..2d8642a84bc 100644 --- a/server/src/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java @@ -38,7 +38,7 @@ public class ApiResponseSerializer { if ((responses != null) && !responses.isEmpty()) { int count = responses.size(); String jsonStr = gson.toJson(responses.get(0)); - sb.append("{ \"" + responses.get(0).getResponseName() + "\" : [ " + jsonStr); + sb.append("{ \"" + responses.get(0).getObjectName() + "\" : [ " + jsonStr); for (int i = 1; i < count; i++) { jsonStr = gson.toJson(responses.get(i)); sb.append(", " + jsonStr); @@ -50,7 +50,11 @@ public class ApiResponseSerializer { } else { String jsonStr = gson.toJson(result); if ((jsonStr != null) && !"".equals(jsonStr)) { - sb.append(jsonStr); + if (result instanceof AsyncJobResponse) { + sb.append(jsonStr); + } else { + sb.append(" { \"" + result.getObjectName() + "\" : " + jsonStr + " } "); + } } else { sb.append("{ }"); } diff --git a/server/src/com/cloud/api/response/BaseResponse.java b/server/src/com/cloud/api/response/BaseResponse.java index dfb86c848fa..02ab756ca35 100644 --- a/server/src/com/cloud/api/response/BaseResponse.java +++ b/server/src/com/cloud/api/response/BaseResponse.java @@ -4,6 +4,7 @@ import com.cloud.api.ResponseObject; public class BaseResponse implements ResponseObject { private transient String responseName; + private transient String objectName; @Override public String getResponseName() { @@ -14,5 +15,15 @@ public class BaseResponse implements ResponseObject { public void setResponseName(String responseName) { this.responseName = responseName; } + + @Override + public String getObjectName() { + return objectName; + } + + @Override + public void setObjectName(String objectName) { + this.objectName = objectName; + } } diff --git a/server/src/com/cloud/api/response/SuccessResponse.java b/server/src/com/cloud/api/response/SuccessResponse.java index 14b5c4fce2e..6317fa355f6 100644 --- a/server/src/com/cloud/api/response/SuccessResponse.java +++ b/server/src/com/cloud/api/response/SuccessResponse.java @@ -5,7 +5,7 @@ import com.google.gson.annotations.SerializedName; public class SuccessResponse extends BaseResponse { @SerializedName("success") @Param(description="true if operation is executed successfully") - private Boolean success; + private Boolean success = true; @SerializedName("displaytext") @Param(description="any text associated with the success or failure") private String displayText; diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java index a5a35a36a21..f3efc263c00 100644 --- a/server/src/com/cloud/configuration/ConfigurationManager.java +++ b/server/src/com/cloud/configuration/ConfigurationManager.java @@ -19,7 +19,7 @@ package com.cloud.configuration; import java.util.List; -import com.cloud.api.commands.AddConfigCmd; +import com.cloud.api.commands.CreateCfgCmd; import com.cloud.api.commands.CreateDiskOfferingCmd; import com.cloud.api.commands.CreatePodCmd; import com.cloud.api.commands.CreateServiceOfferingCmd; @@ -302,5 +302,5 @@ public interface ConfigurationManager extends Manager { * Persists a config value via the API call * @return newly created Config object */ - ConfigurationVO addConfig(AddConfigCmd cmd); + ConfigurationVO addConfig(CreateCfgCmd cmd); } diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index aac282a2904..5f05493b3da 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -32,7 +32,7 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; import com.cloud.api.ServerApiException; -import com.cloud.api.commands.AddConfigCmd; +import com.cloud.api.commands.CreateCfgCmd; import com.cloud.api.commands.CreateDiskOfferingCmd; import com.cloud.api.commands.CreatePodCmd; import com.cloud.api.commands.CreateServiceOfferingCmd; @@ -2178,7 +2178,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager { } @Override - public ConfigurationVO addConfig(AddConfigCmd cmd){ + public ConfigurationVO addConfig(CreateCfgCmd cmd){ String category = cmd.getCategory(); String instance = cmd.getInstance(); String component = cmd.getComponent();