diff --git a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java index 250e34b70fd..2e618b30140 100644 --- a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java @@ -99,7 +99,7 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { public SuccessResponse getResponse() { SuccessResponse response = new SuccessResponse(); response.setSuccess(Boolean.TRUE); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/AttachIsoCmd.java b/server/src/com/cloud/api/commands/AttachIsoCmd.java index 10ed4da7f08..5219fe79e98 100755 --- a/server/src/com/cloud/api/commands/AttachIsoCmd.java +++ b/server/src/com/cloud/api/commands/AttachIsoCmd.java @@ -108,7 +108,7 @@ public class AttachIsoCmd extends BaseAsyncCmd { response.setVirtualMachineId(virtualMachineId); response.setVirtualMachineName(vmInstance.getHostName()); response.setVirtualMachineState(vmInstance.getState().toString()); - response.setResponseName(getName()); + response.setResponseName("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 eaaf17f3381..c99cf7e1cff 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(getName()); + response.setResponseName("volume"); return response; } } diff --git a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java index e1a1247fb7b..388fa7c6d66 100644 --- a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java @@ -238,7 +238,7 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd { response.setResponses(responses); } - response.setResponseName(getName()); + response.setResponseName("networkgroup"); return response; } } diff --git a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java index 6b20209f775..7160608e80e 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(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java index 4ae5126d1ec..a4afcb8badb 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(getName()); + response.setResponseName("storagepool"); return response; } } diff --git a/server/src/com/cloud/api/commands/CopyIsoCmd.java b/server/src/com/cloud/api/commands/CopyIsoCmd.java index 6bfda59c2db..5903257a2b0 100644 --- a/server/src/com/cloud/api/commands/CopyIsoCmd.java +++ b/server/src/com/cloud/api/commands/CopyIsoCmd.java @@ -175,7 +175,7 @@ public class CopyIsoCmd extends BaseAsyncCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to copy iso"); } - isoResponse.setResponseName(getName()); + isoResponse.setResponseName("iso"); return isoResponse; } diff --git a/server/src/com/cloud/api/commands/CopyTemplateCmd.java b/server/src/com/cloud/api/commands/CopyTemplateCmd.java index d01f3793ceb..4a5ddfbcf25 100644 --- a/server/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -178,7 +178,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to copy template"); } - templateResponse.setResponseName(getName()); + templateResponse.setResponseName("template"); return templateResponse; } } diff --git a/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java index 48bd170bfce..bd9aa58dd93 100644 --- a/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java @@ -110,7 +110,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { response.setAccountName(responseObj.getAccountName()); response.setDomainId(responseObj.getDomainId()); response.setDomainName(ApiDBUtils.findDomainById(responseObj.getDomainId()).getName()); - response.setResponseName(getName()); + response.setResponseName("remoteaccessvpn"); 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 9b018b31696..ff56d9902b1 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(getName()); + response.setResponseName("snapshot"); return response; } diff --git a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java index c46c9544764..a8d5648994e 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java @@ -116,7 +116,7 @@ public class CreateSnapshotInternalCmd extends BaseAsyncCmd { response.setCreated(snapshot.getCreated()); response.setName(snapshot.getName()); - response.setResponseName(getName()); + response.setResponseName("snapshot"); return response; } } diff --git a/server/src/com/cloud/api/commands/CreateTemplateCmd.java b/server/src/com/cloud/api/commands/CreateTemplateCmd.java index b4f9c03fc2a..da42b895285 100644 --- a/server/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -211,7 +211,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { response.setZoneName(zone.getName()); } - response.setResponseName(getName()); + response.setResponseName("template"); return response; } } diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java index 1d189443438..6dcb43abb0b 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(getName()); + response.setResponseName("volume"); return response; } } diff --git a/server/src/com/cloud/api/commands/DeleteDomainCmd.java b/server/src/com/cloud/api/commands/DeleteDomainCmd.java index cddaa169105..964d44d8f2f 100644 --- a/server/src/com/cloud/api/commands/DeleteDomainCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDomainCmd.java @@ -100,7 +100,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host"); } - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/DeleteIsoCmd.java b/server/src/com/cloud/api/commands/DeleteIsoCmd.java index ba360ca58da..a763962d4f5 100644 --- a/server/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -84,7 +84,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete iso"); } - response.setResponseName(getName()); + response.setResponseName("success"); return response; } diff --git a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index 8d0ed39cda8..39b118e3cfc 100644 --- a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -84,7 +84,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java index 9730191384c..de3c37ddaa2 100644 --- a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java @@ -82,7 +82,7 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java index 5ee5fb87eab..35d162abc9f 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -100,7 +100,7 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java index 6d454d46da8..5811aa819bd 100644 --- a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -78,7 +78,7 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } diff --git a/server/src/com/cloud/api/commands/DeleteUserCmd.java b/server/src/com/cloud/api/commands/DeleteUserCmd.java index 0b05c59ce08..4e7cec17efd 100644 --- a/server/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/server/src/com/cloud/api/commands/DeleteUserCmd.java @@ -93,7 +93,7 @@ public class DeleteUserCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/DeployVMCmd.java b/server/src/com/cloud/api/commands/DeployVMCmd.java index 903ab4789c7..92d4637d00c 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(getName()); + response.setResponseName("virtualmachine"); return response; } } diff --git a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index 039d921d660..389c6c72e46 100644 --- a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -87,7 +87,7 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/DestroyVMCmd.java b/server/src/com/cloud/api/commands/DestroyVMCmd.java index 40fa780ccb9..176bdc4f3ab 100644 --- a/server/src/com/cloud/api/commands/DestroyVMCmd.java +++ b/server/src/com/cloud/api/commands/DestroyVMCmd.java @@ -85,7 +85,7 @@ public class DestroyVMCmd extends BaseAsyncCmd { public UserVmResponse getResponse() { UserVm userVm = (UserVm)getResponseObject(); UserVmResponse recoverVmResponse = ApiResponseHelper.createUserVmResponse(userVm); - recoverVmResponse.setResponseName(getName()); + recoverVmResponse.setResponseName("virtualmachine"); return recoverVmResponse; } } diff --git a/server/src/com/cloud/api/commands/DetachIsoCmd.java b/server/src/com/cloud/api/commands/DetachIsoCmd.java index 8c4a8beb4e3..741524485d3 100644 --- a/server/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/server/src/com/cloud/api/commands/DetachIsoCmd.java @@ -85,7 +85,7 @@ public class DetachIsoCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("iso"); return response; } } diff --git a/server/src/com/cloud/api/commands/DetachVolumeCmd.java b/server/src/com/cloud/api/commands/DetachVolumeCmd.java index 15c70d6e119..faedbeb04c4 100755 --- a/server/src/com/cloud/api/commands/DetachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DetachVolumeCmd.java @@ -120,7 +120,7 @@ public class DetachVolumeCmd extends BaseAsyncCmd { public VolumeResponse getResponse() { VolumeVO volume = (VolumeVO)getResponseObject(); VolumeResponse response = ApiResponseHelper.createVolumeResponse(volume); - response.setResponseName(getName()); + response.setResponseName("volume"); return response; } } \ No newline at end of file diff --git a/server/src/com/cloud/api/commands/DisableAccountCmd.java b/server/src/com/cloud/api/commands/DisableAccountCmd.java index 1418451c3d8..7ff231f492f 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(getName()); + response.setResponseName("account"); return response; } } diff --git a/server/src/com/cloud/api/commands/DisableUserCmd.java b/server/src/com/cloud/api/commands/DisableUserCmd.java index af43617e06e..3403bf69ea6 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(getName()); + response.setResponseName("user"); return response; } } diff --git a/server/src/com/cloud/api/commands/ExtractIsoCmd.java b/server/src/com/cloud/api/commands/ExtractIsoCmd.java index b478937428d..c84538ac08c 100755 --- a/server/src/com/cloud/api/commands/ExtractIsoCmd.java +++ b/server/src/com/cloud/api/commands/ExtractIsoCmd.java @@ -108,7 +108,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd { UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); ExtractResponse response = new ExtractResponse(); - response.setResponseName(getName()); + response.setResponseName("iso"); response.setId(id); response.setName(ApiDBUtils.findTemplateById(id).getName()); response.setZoneId(zoneId); diff --git a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java index 4b3882d8884..708ef548ccb 100755 --- a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java +++ b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java @@ -113,7 +113,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); ExtractResponse response = new ExtractResponse(); - response.setResponseName(getName()); + response.setResponseName("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 870f0732b78..3437fb07d2d 100755 --- a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -111,7 +111,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); ExtractResponse response = new ExtractResponse(); - response.setResponseName(getName()); + response.setResponseName("volume"); response.setId(id); response.setName(ApiDBUtils.findVolumeById(id).getName()); response.setZoneId(zoneId); diff --git a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java index 92cd63e23f8..041c3f799c4 100644 --- a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java @@ -89,7 +89,7 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd { public HostResponse getResponse() { HostVO host = (HostVO)getResponseObject(); HostResponse response = ApiResponseHelper.createHostResponse(host); - response.setResponseName(getName()); + response.setResponseName("host"); return response; } } diff --git a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java index 0aef903c0d9..845d9d8a997 100644 --- a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java @@ -88,7 +88,7 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd { public StoragePoolResponse getResponse() { StoragePoolVO primaryStorage = (StoragePoolVO)getResponseObject(); StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(primaryStorage); - response.setResponseName(getName()); + response.setResponseName("storagepool"); return response; } } diff --git a/server/src/com/cloud/api/commands/RebootRouterCmd.java b/server/src/com/cloud/api/commands/RebootRouterCmd.java index 5668080ed3b..e63dfce689f 100644 --- a/server/src/com/cloud/api/commands/RebootRouterCmd.java +++ b/server/src/com/cloud/api/commands/RebootRouterCmd.java @@ -86,7 +86,7 @@ public class RebootRouterCmd extends BaseAsyncCmd { public DomainRouterResponse getResponse() { DomainRouter router = (DomainRouter)getResponseObject(); DomainRouterResponse response = ApiResponseHelper.createDomainRouterResponse(router); - response.setResponseName(getName()); + response.setResponseName("router"); return response; } } diff --git a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java index 7f8ec0629c2..63d8ff4c216 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(getName()); + response.setResponseName("systemvm"); return response; } } diff --git a/server/src/com/cloud/api/commands/RebootVMCmd.java b/server/src/com/cloud/api/commands/RebootVMCmd.java index ab407b31782..bc05e21f217 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(getName()); + recoverVmResponse.setResponseName("virtualmachine"); return recoverVmResponse; } } diff --git a/server/src/com/cloud/api/commands/ReconnectHostCmd.java b/server/src/com/cloud/api/commands/ReconnectHostCmd.java index 002eca30f9b..9b706f2e8c2 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(getName()); + response.setResponseName("host"); return response; } diff --git a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index f4a20e14dac..49ac99decd7 100644 --- a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -108,7 +108,7 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java index 395bbfce003..05ac1337738 100644 --- a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java @@ -87,7 +87,7 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } diff --git a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java index a445c087bca..0f5ceda7900 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(getName()); + response.setResponseName("virtualmachine"); return response; } } diff --git a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index a50433c1144..5e6a1e3318c 100644 --- a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -183,7 +183,7 @@ public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd { Boolean success = (Boolean)getResponseObject(); SuccessResponse response = new SuccessResponse(); response.setSuccess(success); - response.setResponseName(getName()); + response.setResponseName("success"); return response; } } diff --git a/server/src/com/cloud/api/commands/StartRouterCmd.java b/server/src/com/cloud/api/commands/StartRouterCmd.java index 8f19bc1e138..a0e4fc9b167 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(getName()); + routerResponse.setResponseName("router"); return routerResponse; } } diff --git a/server/src/com/cloud/api/commands/StartSystemVMCmd.java b/server/src/com/cloud/api/commands/StartSystemVMCmd.java index ea9f480fe05..b37edd4e868 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(getName()); + response.setResponseName("systemvm"); return response; } } diff --git a/server/src/com/cloud/api/commands/StartVMCmd.java b/server/src/com/cloud/api/commands/StartVMCmd.java index 8de866250f0..0ff196583c6 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(getName()); + recoverVmResponse.setResponseName("virtualmachine"); return recoverVmResponse; } } diff --git a/server/src/com/cloud/api/commands/StopRouterCmd.java b/server/src/com/cloud/api/commands/StopRouterCmd.java index 5e8eb0a1d0b..0631d2d33f5 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(getName()); + response.setResponseName("router"); return response; } } diff --git a/server/src/com/cloud/api/commands/StopSystemVmCmd.java b/server/src/com/cloud/api/commands/StopSystemVmCmd.java index c58df10adea..01a59af8ad2 100644 --- a/server/src/com/cloud/api/commands/StopSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/StopSystemVmCmd.java @@ -21,7 +21,7 @@ package com.cloud.api.commands; import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; -import com.cloud.api.ApiDBUtils; +import com.cloud.api.ApiResponseHelper; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -30,8 +30,6 @@ import com.cloud.event.EventTypes; import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.user.UserContext; -import com.cloud.vm.ConsoleProxyVO; -import com.cloud.vm.SecondaryStorageVmVO; import com.cloud.vm.VMInstanceVO; @Implementation(method="stopSystemVM", manager=ManagementServer.class, description="Stops a system VM.") @@ -87,49 +85,8 @@ public class StopSystemVmCmd extends BaseAsyncCmd { @Override @SuppressWarnings("unchecked") public SystemVmResponse getResponse() { VMInstanceVO instance = (VMInstanceVO)getResponseObject(); - - SystemVmResponse response = new SystemVmResponse(); - response.setId(instance.getId()); - response.setName(instance.getHostName()); - response.setZoneId(instance.getDataCenterId()); - response.setZoneName(ApiDBUtils.findZoneById(instance.getDataCenterId()).getName()); - response.setPodId(instance.getPodId()); - response.setHostId(instance.getHostId()); - if (response.getHostId() != null) { - response.setHostName(ApiDBUtils.findHostById(instance.getHostId()).getName()); - } - - response.setPrivateIp(instance.getPrivateIpAddress()); - response.setPrivateMacAddress(instance.getPrivateMacAddress()); - response.setPrivateNetmask(instance.getPrivateNetmask()); - response.setTemplateId(instance.getTemplateId()); - response.setCreated(instance.getCreated()); - response.setState(instance.getState().toString()); - - if (instance instanceof SecondaryStorageVmVO) { - SecondaryStorageVmVO ssVm = (SecondaryStorageVmVO) instance; - response.setDns1(ssVm.getDns1()); - response.setDns2(ssVm.getDns2()); - response.setNetworkDomain(ssVm.getDomain()); - response.setGateway(ssVm.getGateway()); - - response.setPublicIp(ssVm.getPublicIpAddress()); - response.setPublicMacAddress(ssVm.getPublicMacAddress()); - response.setPublicNetmask(ssVm.getPublicNetmask()); - } else if (instance instanceof ConsoleProxyVO) { - ConsoleProxyVO proxy = (ConsoleProxyVO)instance; - response.setDns1(proxy.getDns1()); - response.setDns2(proxy.getDns2()); - response.setNetworkDomain(proxy.getDomain()); - response.setGateway(proxy.getGateway()); - - response.setPublicIp(proxy.getPublicIpAddress()); - response.setPublicMacAddress(proxy.getPublicMacAddress()); - response.setPublicNetmask(proxy.getPublicNetmask()); - response.setActiveViewerSessions(proxy.getActiveSession()); - } - - response.setResponseName(getName()); + SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance); + response.setResponseName("systemvm"); return response; } } diff --git a/server/src/com/cloud/api/commands/StopVMCmd.java b/server/src/com/cloud/api/commands/StopVMCmd.java index f5308f29925..46d084fe8da 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(getName()); + recoverVmResponse.setResponseName("virtualmachine"); return recoverVmResponse; } } diff --git a/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java b/server/src/com/cloud/api/commands/UpdateIPForwardingRuleCmd.java index 1e0cb77e459..cae51852800 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(getName()); + response.setResponseName("portforwardingrule"); return response; } } diff --git a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java index 859ee394c9c..8c9ebb7e0e5 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(getName()); + response.setResponseName("loadbalancerrule"); return response; } } diff --git a/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java index f5be58624cb..2751d915e8e 100644 --- a/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java @@ -23,7 +23,6 @@ import com.cloud.api.ApiConstants; import com.cloud.api.BaseAsyncCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; -import com.cloud.api.BaseCmd.CommandType; import com.cloud.api.response.CustomCertificateResponse; import com.cloud.event.EventTypes; import com.cloud.user.Account; @@ -45,7 +44,7 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd { public CustomCertificateResponse getResponse() { String updatedCpIdList = (String)getResponseObject(); CustomCertificateResponse response = new CustomCertificateResponse(); - response.setResponseName(s_name); + response.setResponseName("customcertificate"); response.setUpdatedConsoleProxyIdList(updatedCpIdList); return response; } diff --git a/server/src/com/cloud/api/response/ApiResponseSerializer.java b/server/src/com/cloud/api/response/ApiResponseSerializer.java index 4156e743a68..f3a68d8646a 100644 --- a/server/src/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/com/cloud/api/response/ApiResponseSerializer.java @@ -51,28 +51,29 @@ public class ApiResponseSerializer { * If the old style (2.1.x) async job responses are desired, uncomment the following code. Note: Many of the commands will need to set the response name to * something like "getResultObjectName()" [see StopVMCmd for an example] in order to truly reinstate the old behavior. The current response names are based * on the new style. Also, this is done for JSON, so the XML Serializer will need to be fixed up to compensate, but the following code can be used to guide - * the changes to XML serializer. - } else if (result instanceof AsyncJobResponse) { - // this code is in here to preserve old behavior for the async job result response - AsyncJobResponse asyncResponse = (AsyncJobResponse)result; - if ("object".equalsIgnoreCase(asyncResponse.getJobResultType())) { - // we require special handling for object, otherwise we serialize it the standard way - ResponseObject subResponse = asyncResponse.getJobResult(); - asyncResponse.setJobResult(null); - String jsonStr = gson.toJson(result); - int index = jsonStr.lastIndexOf('}'); - sb.append(jsonStr.substring(0, index)); - String subRespJson = gson.toJson(subResponse); - sb.append(", \"" + subResponse.getResponseName() + "\" : [ " + subRespJson + " ] }"); - } else { - String jsonStr = gson.toJson(result); - if ((jsonStr != null) && !"".equals(jsonStr)) { - sb.append(jsonStr); - } else { - sb.append("{ }"); - } - } -*/ + * the changes to XML serializer. */ +// } else if (result instanceof AsyncJobResponse) { +// // this code is in here to preserve old behavior for the async job result response +// AsyncJobResponse asyncResponse = (AsyncJobResponse)result; +// if ("object".equalsIgnoreCase(asyncResponse.getJobResultType())) { +// // we require special handling for object, otherwise we serialize it the standard way +// ResponseObject subResponse = asyncResponse.getJobResult(); +// asyncResponse.setJobResult(null); +// String jsonStr = gson.toJson(result); +// int index = jsonStr.lastIndexOf('}'); +// sb.append(jsonStr.substring(0, index)); +// String subRespJson = gson.toJson(subResponse); +// sb.append(", \"" + subResponse.getResponseName() + "\" : [ " + subRespJson + " ] }"); +// } else { +// String jsonStr = gson.toJson(result); +// if ((jsonStr != null) && !"".equals(jsonStr)) { +// sb.append(jsonStr); +// } else { +// sb.append("{ }"); +// } +// } + + } else { String jsonStr = gson.toJson(result); if ((jsonStr != null) && !"".equals(jsonStr)) { @@ -108,12 +109,18 @@ public class ApiResponseSerializer { } private static void serializeResponseObjXML(StringBuilder sb, ResponseObject obj) { - sb.append("<" + obj.getResponseName() + ">"); + if (!(obj instanceof SuccessResponse)&& !(obj instanceof ExceptionResponse)) + sb.append("<" + obj.getResponseName() + ">"); serializeResponseObjFieldsXML(sb, obj); - sb.append(""); + if (!(obj instanceof SuccessResponse) && !(obj instanceof ExceptionResponse)) + sb.append(""); } private static void serializeResponseObjFieldsXML(StringBuilder sb, ResponseObject obj) { + boolean isAsync = false; + if (obj instanceof AsyncJobResponse) + isAsync = true; + Field[] fields = obj.getClass().getDeclaredFields(); for (Field field : fields) { if ((field.getModifiers() & Modifier.TRANSIENT) != 0) { @@ -133,7 +140,13 @@ public class ApiResponseSerializer { if (fieldValue != null) { if (fieldValue instanceof ResponseObject) { ResponseObject subObj = (ResponseObject)fieldValue; + if (isAsync) { + sb.append(""); + } serializeResponseObjXML(sb, subObj); + if (isAsync) { + sb.append(""); + } } else if (fieldValue instanceof Date) { sb.append("<" + serializedName.value() + ">" + BaseCmd.getDateString((Date)fieldValue) + ""); } else {