From 1a8d9a92a744b131ec3de1cdaddede5fb8cd7d54 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 15 Nov 2010 15:07:18 -0800 Subject: [PATCH] Modified all api calls to throw ApiServerException if null object is returned by the manager. --- .../com/cloud/api/commands/AddHostCmd.java | 2 +- .../api/commands/AddSecondaryStorageCmd.java | 2 +- .../com/cloud/api/commands/AddVpnUserCmd.java | 32 +-- .../commands/AssignToLoadBalancerRuleCmd.java | 2 +- .../api/commands/AssociateIPAddrCmd.java | 12 +- .../com/cloud/api/commands/AttachIsoCmd.java | 14 +- .../cloud/api/commands/AttachVolumeCmd.java | 12 +- .../AuthorizeNetworkGroupIngressCmd.java | 9 +- .../api/commands/CancelMaintenanceCmd.java | 12 +- .../CancelPrimaryStorageMaintenanceCmd.java | 12 +- .../com/cloud/api/commands/CopyIsoCmd.java | 2 +- .../cloud/api/commands/CopyTemplateCmd.java | 2 +- .../com/cloud/api/commands/CreateCfgCmd.java | 2 +- .../api/commands/CreateDiskOfferingCmd.java | 2 +- .../cloud/api/commands/CreateDomainCmd.java | 2 +- .../commands/CreateIpForwardingRuleCmd.java | 10 +- .../commands/CreateLoadBalancerRuleCmd.java | 12 +- .../api/commands/CreateNetworkGroupCmd.java | 28 +-- .../com/cloud/api/commands/CreatePodCmd.java | 12 +- .../commands/CreatePortForwardingRuleCmd.java | 2 +- .../commands/CreateRemoteAccessVpnCmd.java | 32 +-- .../commands/CreateServiceOfferingCmd.java | 12 +- .../cloud/api/commands/CreateSnapshotCmd.java | 5 +- .../commands/CreateSnapshotInternalCmd.java | 46 ++-- .../api/commands/CreateSnapshotPolicyCmd.java | 12 +- .../api/commands/CreateStoragePoolCmd.java | 4 +- .../cloud/api/commands/CreateTemplateCmd.java | 102 ++++----- .../com/cloud/api/commands/CreateUserCmd.java | 12 +- .../cloud/api/commands/CreateVMGroupCmd.java | 12 +- .../api/commands/CreateVlanIpRangeCmd.java | 12 +- .../cloud/api/commands/CreateVolumeCmd.java | 20 +- .../com/cloud/api/commands/CreateZoneCmd.java | 12 +- .../api/commands/DeleteDiskOfferingCmd.java | 2 +- .../cloud/api/commands/DeleteDomainCmd.java | 2 +- .../com/cloud/api/commands/DeleteHostCmd.java | 2 +- .../commands/DeleteIpForwardingRuleCmd.java | 18 +- .../com/cloud/api/commands/DeleteIsoCmd.java | 2 +- .../commands/DeleteLoadBalancerRuleCmd.java | 2 +- .../api/commands/DeleteNetworkGroupCmd.java | 2 +- .../com/cloud/api/commands/DeletePodCmd.java | 2 +- .../com/cloud/api/commands/DeletePoolCmd.java | 2 +- .../commands/DeletePortForwardingRuleCmd.java | 2 +- .../commands/DeletePreallocatedLunCmd.java | 2 +- .../commands/DeleteRemoteAccessVpnCmd.java | 2 +- .../commands/DeleteServiceOfferingCmd.java | 2 +- .../cloud/api/commands/DeleteSnapshotCmd.java | 2 +- .../commands/DeleteSnapshotPoliciesCmd.java | 2 +- .../cloud/api/commands/DeleteTemplateCmd.java | 2 +- .../com/cloud/api/commands/DeleteUserCmd.java | 2 +- .../cloud/api/commands/DeleteVMGroupCmd.java | 2 +- .../api/commands/DeleteVlanIpRangeCmd.java | 2 +- .../cloud/api/commands/DeleteVolumeCmd.java | 2 +- .../com/cloud/api/commands/DeleteZoneCmd.java | 2 +- .../com/cloud/api/commands/DeployVMCmd.java | 17 +- .../com/cloud/api/commands/DeployVm2Cmd.java | 22 +- .../api/commands/DestroyConsoleProxyCmd.java | 2 +- .../com/cloud/api/commands/DestroyVMCmd.java | 12 +- .../com/cloud/api/commands/DetachIsoCmd.java | 4 +- .../cloud/api/commands/DetachVolumeCmd.java | 12 +- .../cloud/api/commands/DisableAccountCmd.java | 12 +- .../cloud/api/commands/DisableUserCmd.java | 12 +- .../api/commands/DisassociateIPAddrCmd.java | 2 +- .../cloud/api/commands/EnableAccountCmd.java | 12 +- .../com/cloud/api/commands/EnableUserCmd.java | 12 +- .../com/cloud/api/commands/ExtractIsoCmd.java | 38 ++-- .../api/commands/ExtractTemplateCmd.java | 39 ++-- .../cloud/api/commands/ExtractVolumeCmd.java | 37 ++-- .../api/commands/GetCloudIdentifierCmd.java | 4 +- .../cloud/api/commands/ListAccountsCmd.java | 3 +- .../com/cloud/api/commands/ListAlertsCmd.java | 3 +- .../cloud/api/commands/ListAsyncJobsCmd.java | 3 +- .../api/commands/ListCapabilitiesCmd.java | 2 +- .../cloud/api/commands/ListCapacityCmd.java | 3 +- .../com/cloud/api/commands/ListCfgsByCmd.java | 3 +- .../cloud/api/commands/ListClustersCmd.java | 3 +- .../api/commands/ListDiskOfferingsCmd.java | 3 +- .../api/commands/ListDomainChildrenCmd.java | 3 +- .../cloud/api/commands/ListDomainsCmd.java | 3 +- .../com/cloud/api/commands/ListEventsCmd.java | 3 +- .../commands/ListGuestOsCategoriesCmd.java | 3 +- .../cloud/api/commands/ListGuestOsCmd.java | 3 +- .../com/cloud/api/commands/ListHostsCmd.java | 3 +- .../api/commands/ListHypervisorsCmd.java | 2 +- .../com/cloud/api/commands/ListIsosCmd.java | 3 +- .../ListLoadBalancerRuleInstancesCmd.java | 3 +- .../commands/ListLoadBalancerRulesCmd.java | 3 +- .../api/commands/ListNetworkGroupsCmd.java | 3 +- .../com/cloud/api/commands/ListPodsByCmd.java | 3 +- .../commands/ListPortForwardingRulesCmd.java | 3 +- .../api/commands/ListPreallocatedLunsCmd.java | 3 +- .../commands/ListPublicIpAddressesCmd.java | 3 +- .../ListRecurringSnapshotScheduleCmd.java | 3 +- .../api/commands/ListRemoteAccessVpnsCmd.java | 3 +- .../api/commands/ListResourceLimitsCmd.java | 3 +- .../cloud/api/commands/ListRoutersCmd.java | 3 +- .../api/commands/ListServiceOfferingsCmd.java | 3 +- .../api/commands/ListSnapshotPoliciesCmd.java | 3 +- .../cloud/api/commands/ListSnapshotsCmd.java | 3 +- .../api/commands/ListStoragePoolsCmd.java | 3 +- .../cloud/api/commands/ListSystemVMsCmd.java | 3 +- .../ListTemplateOrIsoPermissionsCmd.java | 3 +- .../cloud/api/commands/ListTemplatesCmd.java | 3 +- .../com/cloud/api/commands/ListUsersCmd.java | 2 +- .../cloud/api/commands/ListVMGroupsCmd.java | 3 +- .../com/cloud/api/commands/ListVMsCmd.java | 3 +- .../api/commands/ListVlanIpRangesCmd.java | 3 +- .../cloud/api/commands/ListVolumesCmd.java | 3 +- .../cloud/api/commands/ListVpnUsersCmd.java | 3 +- .../cloud/api/commands/ListZonesByCmd.java | 3 +- .../cloud/api/commands/LockAccountCmd.java | 12 +- .../com/cloud/api/commands/LockUserCmd.java | 13 +- .../commands/PrepareForMaintenanceCmd.java | 12 +- ...reparePrimaryStorageForMaintenanceCmd.java | 12 +- .../api/commands/QueryAsyncJobResultCmd.java | 2 +- .../cloud/api/commands/RebootRouterCmd.java | 12 +- .../cloud/api/commands/RebootSystemVmCmd.java | 12 +- .../com/cloud/api/commands/RebootVMCmd.java | 12 +- .../cloud/api/commands/ReconnectHostCmd.java | 12 +- .../com/cloud/api/commands/RecoverVMCmd.java | 12 +- .../com/cloud/api/commands/RegisterCmd.java | 2 +- .../cloud/api/commands/RegisterIsoCmd.java | 93 +++++---- .../commands/RegisterPreallocatedLunCmd.java | 12 +- .../api/commands/RegisterTemplateCmd.java | 113 +++++----- .../RemoveFromLoadBalancerRuleCmd.java | 2 +- .../cloud/api/commands/RemoveVpnUserCmd.java | 2 +- .../api/commands/ResetVMPasswordCmd.java | 18 +- .../RevokeNetworkGroupIngressCmd.java | 2 +- .../cloud/api/commands/StartRouter2Cmd.java | 12 +- .../cloud/api/commands/StartRouterCmd.java | 12 +- .../cloud/api/commands/StartSystemVMCmd.java | 14 +- .../cloud/api/commands/StartSystemVm2Cmd.java | 12 +- .../com/cloud/api/commands/StartVMCmd.java | 12 +- .../com/cloud/api/commands/StartVm2Cmd.java | 196 +++++++++--------- .../cloud/api/commands/StopRouter2Cmd.java | 12 +- .../com/cloud/api/commands/StopRouterCmd.java | 12 +- .../cloud/api/commands/StopSystemVm2Cmd.java | 11 +- .../cloud/api/commands/StopSystemVmCmd.java | 12 +- .../src/com/cloud/api/commands/StopVMCmd.java | 12 +- .../com/cloud/api/commands/StopVm2Cmd.java | 2 +- .../cloud/api/commands/UpdateAccountCmd.java | 12 +- .../com/cloud/api/commands/UpdateCfgCmd.java | 2 +- .../api/commands/UpdateDiskOfferingCmd.java | 12 +- .../cloud/api/commands/UpdateDomainCmd.java | 2 +- .../com/cloud/api/commands/UpdateHostCmd.java | 2 +- .../com/cloud/api/commands/UpdateIsoCmd.java | 2 +- .../api/commands/UpdateIsoPermissionsCmd.java | 2 +- .../commands/UpdateLoadBalancerRuleCmd.java | 12 +- .../com/cloud/api/commands/UpdatePodCmd.java | 12 +- .../commands/UpdatePortForwardingRuleCmd.java | 12 +- .../api/commands/UpdateResourceLimitCmd.java | 12 +- .../commands/UpdateServiceOfferingCmd.java | 12 +- .../api/commands/UpdateStoragePoolCmd.java | 12 +- .../cloud/api/commands/UpdateTemplateCmd.java | 3 +- .../UpdateTemplateOrIsoPermissionsCmd.java | 2 - .../UpdateTemplatePermissionsCmd.java | 2 +- .../com/cloud/api/commands/UpdateUserCmd.java | 12 +- .../com/cloud/api/commands/UpdateVMCmd.java | 12 +- .../cloud/api/commands/UpdateVMGroupCmd.java | 12 +- .../com/cloud/api/commands/UpdateZoneCmd.java | 2 +- .../cloud/api/commands/UpgradeRouterCmd.java | 12 +- .../com/cloud/api/commands/UpgradeVMCmd.java | 12 +- .../commands/UploadCustomCertificateCmd.java | 16 +- .../cloud/server/ManagementServerImpl.java | 7 +- 163 files changed, 988 insertions(+), 763 deletions(-) diff --git a/server/src/com/cloud/api/commands/AddHostCmd.java b/server/src/com/cloud/api/commands/AddHostCmd.java index a33de96892b..d9da0e91659 100644 --- a/server/src/com/cloud/api/commands/AddHostCmd.java +++ b/server/src/com/cloud/api/commands/AddHostCmd.java @@ -114,7 +114,7 @@ public class AddHostCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - List result = BaseCmd._agentMgr.discoverHosts(this); + List result = _agentMgr.discoverHosts(this); ListResponse response = new ListResponse(); List hostResponses = new ArrayList(); if (result != null) { diff --git a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java index dcc75f026d5..9eebcea5e0f 100644 --- a/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java +++ b/server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java @@ -76,7 +76,7 @@ public class AddSecondaryStorageCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - List result = BaseCmd._agentMgr.discoverHosts(this); + List result = _agentMgr.discoverHosts(this); HostResponse hostResponse = null; if (result != null && result.size() > 0) { for (HostVO host : result) { diff --git a/server/src/com/cloud/api/commands/AddVpnUserCmd.java b/server/src/com/cloud/api/commands/AddVpnUserCmd.java index b0ecd6806d3..636f1694299 100644 --- a/server/src/com/cloud/api/commands/AddVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/AddVpnUserCmd.java @@ -128,20 +128,24 @@ public class AddVpnUserCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - VpnUserVO vpnUser = BaseCmd._networkMgr.addVpnUser(this); - VpnUsersResponse vpnResponse = new VpnUsersResponse(); - vpnResponse.setId(vpnUser.getId()); - vpnResponse.setUserName(vpnUser.getUsername()); - vpnResponse.setAccountName(vpnUser.getAccountName()); - - Account accountTemp = ApiDBUtils.findAccountById(vpnUser.getAccountId()); - if (accountTemp != null) { - vpnResponse.setDomainId(accountTemp.getDomainId()); - vpnResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName()); + VpnUserVO vpnUser = _networkMgr.addVpnUser(this); + if (vpnUser != null) { + VpnUsersResponse vpnResponse = new VpnUsersResponse(); + vpnResponse.setId(vpnUser.getId()); + vpnResponse.setUserName(vpnUser.getUsername()); + vpnResponse.setAccountName(vpnUser.getAccountName()); + + Account accountTemp = ApiDBUtils.findAccountById(vpnUser.getAccountId()); + if (accountTemp != null) { + vpnResponse.setDomainId(accountTemp.getDomainId()); + vpnResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName()); + } + + vpnResponse.setResponseName(getName()); + vpnResponse.setObjectName("vpnuser"); + this.setResponseObject(vpnResponse); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add vpn user"); } - - vpnResponse.setResponseName(getName()); - vpnResponse.setObjectName("vpnuser"); - this.setResponseObject(vpnResponse); } } diff --git a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java index 816d3283804..953a3d70000 100644 --- a/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java @@ -105,7 +105,7 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - boolean result = BaseCmd._networkMgr.assignToLoadBalancer(this); + boolean result = _networkMgr.assignToLoadBalancer(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java index 4ea8151996d..9cdbe3794ef 100644 --- a/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/AssociateIPAddrCmd.java @@ -86,10 +86,14 @@ public class AssociateIPAddrCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - IPAddressVO result = BaseCmd._networkMgr.associateIP(this); - IPAddressResponse ipResponse = ApiResponseHelper.createIPAddressResponse(result); - ipResponse.setResponseName(getName()); - this.setResponseObject(ipResponse); + IPAddressVO result = _networkMgr.associateIP(this); + if (result != null) { + IPAddressResponse ipResponse = ApiResponseHelper.createIPAddressResponse(result); + ipResponse.setResponseName(getName()); + this.setResponseObject(ipResponse); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to assign ip address"); + } } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/AttachIsoCmd.java b/server/src/com/cloud/api/commands/AttachIsoCmd.java index 9d5d71f28c2..30a9144fa32 100755 --- a/server/src/com/cloud/api/commands/AttachIsoCmd.java +++ b/server/src/com/cloud/api/commands/AttachIsoCmd.java @@ -98,12 +98,16 @@ public class AttachIsoCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._templateMgr.attachIso(this); + boolean result = _templateMgr.attachIso(this); if (result) { - UserVm userVm = ApiDBUtils.findUserVmById(virtualMachineId); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(userVm); - response.setResponseName(DeployVMCmd.getResultObjectName()); - this.setResponseObject(response); + UserVm userVm = ApiDBUtils.findUserVmById(virtualMachineId); + if (userVm != null) { + UserVmResponse response = ApiResponseHelper.createUserVmResponse(userVm); + response.setResponseName(DeployVMCmd.getResultObjectName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to attach iso"); + } } 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 4a0675ecc10..c0aaaa270cb 100755 --- a/server/src/com/cloud/api/commands/AttachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/AttachVolumeCmd.java @@ -115,9 +115,13 @@ public class AttachVolumeCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Volume result = BaseCmd._userVmService.attachVolumeToVM(this); - VolumeResponse response = ApiResponseHelper.createVolumeResponse((VolumeVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + Volume result = _userVmService.attachVolumeToVM(this); + if (result != null) { + VolumeResponse response = ApiResponseHelper.createVolumeResponse((VolumeVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to attach volume"); + } } } diff --git a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java index cc1a8270034..379853f0731 100644 --- a/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java @@ -214,7 +214,7 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List ingressRules = BaseCmd._networkGroupMgr.authorizeNetworkGroupIngress(this); + List ingressRules = _networkGroupMgr.authorizeNetworkGroupIngress(this); ListResponse response = new ListResponse(); if ((ingressRules != null) && !ingressRules.isEmpty()) { List responses = new ArrayList(); @@ -242,8 +242,11 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd { responses.add(ingressData); } response.setResponses(responses); + response.setResponseName("securitygroupingressrule"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to authorize network group ingress rule"); } - response.setResponseName("securitygroupingressrule"); - this.setResponseObject(response); + } } diff --git a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java index dc00d08398d..72fdebfbb4c 100644 --- a/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelMaintenanceCmd.java @@ -96,9 +96,13 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - HostVO result = BaseCmd._agentMgr.cancelMaintenance(this); - HostResponse response = ApiResponseHelper.createHostResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + HostVO result = _agentMgr.cancelMaintenance(this); + if (result != null) { + HostResponse response = ApiResponseHelper.createHostResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to cancel host maintenance"); + } } } diff --git a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java index 9b716ce23ee..f4c2da21bb8 100644 --- a/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java @@ -96,9 +96,13 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - StoragePoolVO result = BaseCmd._storageMgr.cancelPrimaryStorageForMaintenance(this); - StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + StoragePoolVO result = _storageMgr.cancelPrimaryStorageForMaintenance(this); + if (result != null) { + StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to cancel primary storage maintenance"); + } } } diff --git a/server/src/com/cloud/api/commands/CopyIsoCmd.java b/server/src/com/cloud/api/commands/CopyIsoCmd.java index aaf831d8f06..84eaa7ba46a 100644 --- a/server/src/com/cloud/api/commands/CopyIsoCmd.java +++ b/server/src/com/cloud/api/commands/CopyIsoCmd.java @@ -113,7 +113,7 @@ public class CopyIsoCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - VMTemplateVO iso = BaseCmd._templateMgr.copyIso(this); + VMTemplateVO iso = _templateMgr.copyIso(this); TemplateResponse isoResponse = new TemplateResponse(); if (iso != null) { isoResponse.setId(iso.getId()); diff --git a/server/src/com/cloud/api/commands/CopyTemplateCmd.java b/server/src/com/cloud/api/commands/CopyTemplateCmd.java index 4ae04abfbd9..f09881ac7e5 100644 --- a/server/src/com/cloud/api/commands/CopyTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CopyTemplateCmd.java @@ -114,7 +114,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - VMTemplateVO template = BaseCmd._templateMgr.copyTemplate(this); + VMTemplateVO template = _templateMgr.copyTemplate(this); TemplateResponse templateResponse = new TemplateResponse(); if (template != null) { templateResponse.setId(template.getId()); diff --git a/server/src/com/cloud/api/commands/CreateCfgCmd.java b/server/src/com/cloud/api/commands/CreateCfgCmd.java index 2ee3a11f729..96130797c71 100644 --- a/server/src/com/cloud/api/commands/CreateCfgCmd.java +++ b/server/src/com/cloud/api/commands/CreateCfgCmd.java @@ -102,7 +102,7 @@ public class CreateCfgCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Configuration cfg = BaseCmd._configService.addConfig(this); + Configuration cfg = _configService.addConfig(this); if (cfg != null) { ConfigurationResponse response = ApiResponseHelper.createConfigurationResponse((ConfigurationVO)cfg); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java index 79997c8428f..fe30e60be88 100755 --- a/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateDiskOfferingCmd.java @@ -93,7 +93,7 @@ public class CreateDiskOfferingCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DiskOffering offering = BaseCmd._configService.createDiskOffering(this); + DiskOffering offering = _configService.createDiskOffering(this); if (offering != null) { DiskOfferingResponse response = ApiResponseHelper.createDiskOfferingResponse((DiskOfferingVO)offering); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/CreateDomainCmd.java b/server/src/com/cloud/api/commands/CreateDomainCmd.java index e86628cd8bf..b2d177fc472 100644 --- a/server/src/com/cloud/api/commands/CreateDomainCmd.java +++ b/server/src/com/cloud/api/commands/CreateDomainCmd.java @@ -74,7 +74,7 @@ public class CreateDomainCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DomainVO domain = BaseCmd._mgr.createDomain(this); + DomainVO domain = _mgr.createDomain(this); if (domain != null) { DomainResponse response = ApiResponseHelper.createDomainResponse(domain); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java b/server/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java index aa0b5ac6114..d1ee038ed48 100644 --- a/server/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java @@ -80,7 +80,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - FirewallRuleVO result = BaseCmd._networkMgr.createIpForwardingRuleOnDomr(this.getId()); + FirewallRuleVO result = _networkMgr.createIpForwardingRuleOnDomr(this.getId()); if (result != null) { FirewallRuleResponse fwResponse = ApiResponseHelper.createFirewallRuleResponse(result); fwResponse.setResponseName(getName()); @@ -93,8 +93,12 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd { @Override public void callCreate() throws ServerApiException,InvalidParameterValueException, PermissionDeniedException,InsufficientAddressCapacityException,InsufficientCapacityException, ResourceUnavailableException,ConcurrentOperationException, ResourceAllocationException{ - FirewallRuleVO rule = BaseCmd._networkMgr.createIpForwardingRuleInDb(ipAddress,virtualMachineId); - this.setId(rule.getId()); + FirewallRuleVO rule = _networkMgr.createIpForwardingRuleInDb(ipAddress,virtualMachineId); + if (rule != null){ + this.setId(rule.getId()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create ip forwarding rule"); + } } @Override diff --git a/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java index 78ee397b815..60fd10d2f0d 100644 --- a/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java @@ -102,9 +102,13 @@ public class CreateLoadBalancerRuleCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - LoadBalancerVO result = BaseCmd._networkMgr.createLoadBalancerRule(this); - LoadBalancerResponse response = ApiResponseHelper.createLoadBalancerResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + LoadBalancerVO result = _networkMgr.createLoadBalancerRule(this); + if (result != null) { + LoadBalancerResponse response = ApiResponseHelper.createLoadBalancerResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create load balancer rule"); + } } } diff --git a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java index f89b7043022..711283694ad 100644 --- a/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java @@ -88,17 +88,21 @@ public class CreateNetworkGroupCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - NetworkGroupVO group = BaseCmd._networkGroupMgr.createNetworkGroup(this); - NetworkGroupResponse response = new NetworkGroupResponse(); - response.setAccountName(group.getAccountName()); - response.setDescription(group.getDescription()); - response.setDomainId(group.getDomainId()); - response.setDomainName(ApiDBUtils.findDomainById(group.getDomainId()).getName()); - response.setId(group.getId()); - response.setName(group.getName()); - - response.setResponseName(getName()); - response.setObjectName("securitygroup"); - this.setResponseObject(response); + NetworkGroupVO group = _networkGroupMgr.createNetworkGroup(this); + if (group != null) { + NetworkGroupResponse response = new NetworkGroupResponse(); + response.setAccountName(group.getAccountName()); + response.setDescription(group.getDescription()); + response.setDomainId(group.getDomainId()); + response.setDomainName(ApiDBUtils.findDomainById(group.getDomainId()).getName()); + response.setId(group.getId()); + response.setName(group.getName()); + + response.setResponseName(getName()); + response.setObjectName("securitygroup"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create network group"); + } } } diff --git a/server/src/com/cloud/api/commands/CreatePodCmd.java b/server/src/com/cloud/api/commands/CreatePodCmd.java index 344c5867d30..773bf6b7333 100644 --- a/server/src/com/cloud/api/commands/CreatePodCmd.java +++ b/server/src/com/cloud/api/commands/CreatePodCmd.java @@ -103,9 +103,13 @@ public class CreatePodCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Pod result = BaseCmd._configService.createPod(this); - PodResponse response = ApiResponseHelper.createPodResponse((HostPodVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + Pod result = _configService.createPod(this); + if (result != null) { + PodResponse response = ApiResponseHelper.createPodResponse((HostPodVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create pod"); + } } } diff --git a/server/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java b/server/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java index d994f1355ee..bca70fac71d 100644 --- a/server/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java @@ -98,7 +98,7 @@ public class CreatePortForwardingRuleCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - FirewallRuleVO result = BaseCmd._networkMgr.createPortForwardingRule(this); + FirewallRuleVO result = _networkMgr.createPortForwardingRule(this); if (result != null) { FirewallRuleResponse fwResponse = ApiResponseHelper.createFirewallRuleResponse(result); fwResponse.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java index 5c88c23d75e..4d3ddd665e6 100644 --- a/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java @@ -138,27 +138,33 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd { @Override public void callCreate() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException{ - RemoteAccessVpnVO vpn = BaseCmd._networkMgr.createRemoteAccessVpn(this); + RemoteAccessVpnVO vpn = _networkMgr.createRemoteAccessVpn(this); if (vpn != null) { this.setId(vpn.getId()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create remote access vpn"); } } @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - RemoteAccessVpnVO result = BaseCmd._networkMgr.startRemoteAccessVpn(this); - RemoteAccessVpnResponse response = new RemoteAccessVpnResponse(); - response.setId(result.getId()); - response.setPublicIp(result.getVpnServerAddress()); - response.setIpRange(result.getIpRange()); - response.setAccountName(result.getAccountName()); - response.setDomainId(result.getDomainId()); - response.setDomainName(ApiDBUtils.findDomainById(result.getDomainId()).getName()); - response.setObjectName("remoteaccessvpn"); - response.setResponseName(getName()); - response.setPresharedKey(result.getIpsecPresharedKey()); - this.setResponseObject(response); + RemoteAccessVpnVO result = _networkMgr.startRemoteAccessVpn(this); + if (result != null) { + RemoteAccessVpnResponse response = new RemoteAccessVpnResponse(); + response.setId(result.getId()); + response.setPublicIp(result.getVpnServerAddress()); + response.setIpRange(result.getIpRange()); + response.setAccountName(result.getAccountName()); + response.setDomainId(result.getDomainId()); + response.setDomainName(ApiDBUtils.findDomainById(result.getDomainId()).getName()); + response.setObjectName("remoteaccessvpn"); + response.setResponseName(getName()); + response.setPresharedKey(result.getIpsecPresharedKey()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create remote access vpn"); + } } catch (ResourceUnavailableException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java index a6494d41dfe..863cfc2270c 100644 --- a/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java @@ -122,9 +122,13 @@ public class CreateServiceOfferingCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - ServiceOffering result = BaseCmd._configService.createServiceOffering(this); - ServiceOfferingResponse response = ApiResponseHelper.createServiceOfferingResponse((ServiceOfferingVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + ServiceOffering result = _configService.createServiceOffering(this); + if (result != null) { + ServiceOfferingResponse response = ApiResponseHelper.createServiceOfferingResponse((ServiceOfferingVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create service offering"); + } } } diff --git a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java index 12720e39eff..8c236ad1b22 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotCmd.java @@ -111,13 +111,14 @@ public class CreateSnapshotCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - SnapshotVO snapshot = BaseCmd._snapshotMgr.createSnapshot(this); + SnapshotVO snapshot = _snapshotMgr.createSnapshot(this); if (snapshot != null) { SnapshotResponse response = ApiResponseHelper.createSnapshotResponse(snapshot); response.setResponseName(getName()); this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create snapshot due to an internal error creating snapshot for volume " + volumeId); } - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create snapshot due to an internal error creating snapshot for volume " + volumeId); } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java index 94fc6e13110..cb157cfc2ed 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotInternalCmd.java @@ -103,28 +103,32 @@ public class CreateSnapshotInternalCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - SnapshotVO snapshot = BaseCmd._snapshotMgr.createSnapshotInternal(this); - SnapshotResponse response = new SnapshotResponse(); - response.setId(snapshot.getId()); - - Account account = ApiDBUtils.findAccountById(snapshot.getAccountId()); - if (account != null) { - response.setAccountName(account.getAccountName()); - response.setDomainId(account.getDomainId()); - response.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName()); + SnapshotVO snapshot = _snapshotMgr.createSnapshotInternal(this); + if (snapshot != null) { + SnapshotResponse response = new SnapshotResponse(); + response.setId(snapshot.getId()); + + Account account = ApiDBUtils.findAccountById(snapshot.getAccountId()); + if (account != null) { + response.setAccountName(account.getAccountName()); + response.setDomainId(account.getDomainId()); + response.setDomainName(ApiDBUtils.findDomainById(account.getDomainId()).getName()); + } + + VolumeVO volume = ApiDBUtils.findVolumeById(snapshot.getVolumeId()); + String snapshotTypeStr = SnapshotType.values()[snapshot.getSnapshotType()].name(); + response.setSnapshotType(snapshotTypeStr); + response.setVolumeId(snapshot.getVolumeId()); + response.setVolumeName(volume.getName()); + response.setVolumeType(volume.getVolumeType().toString()); + response.setCreated(snapshot.getCreated()); + response.setName(snapshot.getName()); + response.setObjectName("snapshot"); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create snapshot"); } - - VolumeVO volume = ApiDBUtils.findVolumeById(snapshot.getVolumeId()); - String snapshotTypeStr = SnapshotType.values()[snapshot.getSnapshotType()].name(); - response.setSnapshotType(snapshotTypeStr); - response.setVolumeId(snapshot.getVolumeId()); - response.setVolumeName(volume.getName()); - response.setVolumeType(volume.getVolumeType().toString()); - response.setCreated(snapshot.getCreated()); - response.setName(snapshot.getName()); - response.setObjectName("snapshot"); - response.setResponseName(getName()); - this.setResponseObject(response); } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java b/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java index eb9a4b5d864..64c0330492d 100644 --- a/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java +++ b/server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java @@ -115,9 +115,13 @@ public class CreateSnapshotPolicyCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - SnapshotPolicyVO result = BaseCmd._snapshotMgr.createPolicy(this); - SnapshotPolicyResponse response = ApiResponseHelper.createSnapshotPolicyResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + SnapshotPolicyVO result = _snapshotMgr.createPolicy(this); + if (result != null) { + SnapshotPolicyResponse response = ApiResponseHelper.createSnapshotPolicyResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create snapshot policy"); + } } } diff --git a/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java b/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java index 615f8489f23..665b01aa0fd 100644 --- a/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java +++ b/server/src/com/cloud/api/commands/CreateStoragePoolCmd.java @@ -115,13 +115,13 @@ public class CreateStoragePoolCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - StoragePoolVO result = BaseCmd._storageMgr.createPool(this); + StoragePoolVO result = _storageMgr.createPool(this); if (result != null) { StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); response.setResponseName(getName()); this.setResponseObject(response); } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add host"); + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add storage pool"); } } catch (ResourceAllocationException ex1) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex1.getMessage()); diff --git a/server/src/com/cloud/api/commands/CreateTemplateCmd.java b/server/src/com/cloud/api/commands/CreateTemplateCmd.java index d06b7507c35..cf12aff5362 100644 --- a/server/src/com/cloud/api/commands/CreateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/CreateTemplateCmd.java @@ -175,60 +175,66 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd { @Override public void callCreate() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException{ - VMTemplateVO template = BaseCmd._userVmService.createPrivateTemplateRecord(this); - if (template != null) + VMTemplateVO template = _userVmService.createPrivateTemplateRecord(this); + if (template != null){ this.setId(template.getId()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a template"); + } } @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - VMTemplateVO template = BaseCmd._userVmService.createPrivateTemplate(this); - - TemplateResponse response = new TemplateResponse(); - response.setId(template.getId()); - response.setName(template.getName()); - response.setDisplayText(template.getDisplayText()); - response.setPublic(template.isPublicTemplate()); - response.setPasswordEnabled(template.getEnablePassword()); - response.setCrossZones(template.isCrossZones()); - - VolumeVO volume = null; - if (snapshotId != null) { - Snapshot snapshot = ApiDBUtils.findSnapshotById(snapshotId); - volume = ApiDBUtils.findVolumeById(snapshot.getVolumeId()); + VMTemplateVO template = _userVmService.createPrivateTemplate(this); + if (template != null) { + TemplateResponse response = new TemplateResponse(); + response.setId(template.getId()); + response.setName(template.getName()); + response.setDisplayText(template.getDisplayText()); + response.setPublic(template.isPublicTemplate()); + response.setPasswordEnabled(template.getEnablePassword()); + response.setCrossZones(template.isCrossZones()); + + VolumeVO volume = null; + if (snapshotId != null) { + Snapshot snapshot = ApiDBUtils.findSnapshotById(snapshotId); + volume = ApiDBUtils.findVolumeById(snapshot.getVolumeId()); + } else { + volume = ApiDBUtils.findVolumeById(volumeId); + } + + VMTemplateHostVO templateHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), volume.getDataCenterId()); + response.setCreated(templateHostRef.getCreated()); + response.setReady(templateHostRef != null && templateHostRef.getDownloadState() == Status.DOWNLOADED); + + GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId()); + if (os != null) { + response.setOsTypeId(os.getId()); + response.setOsTypeName(os.getDisplayName()); + } else { + response.setOsTypeId(-1L); + response.setOsTypeName(""); + } + + Account owner = ApiDBUtils.findAccountById(template.getAccountId()); + if (owner != null) { + response.setAccount(owner.getAccountName()); + response.setDomainId(owner.getDomainId()); + response.setDomainName(ApiDBUtils.findDomainById(owner.getDomainId()).getName()); + } + + DataCenterVO zone = ApiDBUtils.findZoneById(volume.getDataCenterId()); + if (zone != null) { + response.setZoneId(zone.getId()); + response.setZoneName(zone.getName()); + } + + response.setObjectName("template"); + response.setResponseName(getName()); + + this.setResponseObject(response); } else { - volume = ApiDBUtils.findVolumeById(volumeId); + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create template"); } - - VMTemplateHostVO templateHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), volume.getDataCenterId()); - response.setCreated(templateHostRef.getCreated()); - response.setReady(templateHostRef != null && templateHostRef.getDownloadState() == Status.DOWNLOADED); - - GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId()); - if (os != null) { - response.setOsTypeId(os.getId()); - response.setOsTypeName(os.getDisplayName()); - } else { - response.setOsTypeId(-1L); - response.setOsTypeName(""); - } - - Account owner = ApiDBUtils.findAccountById(template.getAccountId()); - if (owner != null) { - response.setAccount(owner.getAccountName()); - response.setDomainId(owner.getDomainId()); - response.setDomainName(ApiDBUtils.findDomainById(owner.getDomainId()).getName()); - } - - DataCenterVO zone = ApiDBUtils.findZoneById(volume.getDataCenterId()); - if (zone != null) { - response.setZoneId(zone.getId()); - response.setZoneName(zone.getName()); - } - - response.setObjectName("template"); - response.setResponseName(getName()); - - this.setResponseObject(response); } } diff --git a/server/src/com/cloud/api/commands/CreateUserCmd.java b/server/src/com/cloud/api/commands/CreateUserCmd.java index 5f8da0be328..837e7c45eb5 100644 --- a/server/src/com/cloud/api/commands/CreateUserCmd.java +++ b/server/src/com/cloud/api/commands/CreateUserCmd.java @@ -129,9 +129,13 @@ public class CreateUserCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - UserAccount user = BaseCmd._accountService.createUser(this); - UserResponse response = ApiResponseHelper.createUserResponse(user); - response.setResponseName(getName()); - this.setResponseObject(response); + UserAccount user = _accountService.createUser(this); + if (user != null) { + UserResponse response = ApiResponseHelper.createUserResponse(user); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a user"); + } } } \ No newline at end of file diff --git a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java index 1a84d66a392..a634a9d4616 100644 --- a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java @@ -79,9 +79,13 @@ public class CreateVMGroupCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - InstanceGroupVO result = BaseCmd._userVmService.createVmGroup(this); - InstanceGroupResponse response = ApiResponseHelper.createInstanceGroupResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + InstanceGroupVO result = _userVmService.createVmGroup(this); + if (result != null) { + InstanceGroupResponse response = ApiResponseHelper.createInstanceGroupResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create vm instance group"); + } } } diff --git a/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java index e6498a7b1c2..e763fcebea9 100644 --- a/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java @@ -131,9 +131,13 @@ public class CreateVlanIpRangeCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Vlan result = BaseCmd._configService.createVlanAndPublicIpRange(this); - VlanIpRangeResponse response = ApiResponseHelper.createVlanIpRangeResponse((VlanVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + Vlan result = _configService.createVlanAndPublicIpRange(this); + if (result != null) { + VlanIpRangeResponse response = ApiResponseHelper.createVlanIpRangeResponse((VlanVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + }else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create vlan ip range"); + } } } diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java index fa5d773f5eb..65719b992e2 100644 --- a/server/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -148,19 +148,25 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd { @Override public void callCreate() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException{ - Volume volume = BaseCmd._storageMgr.allocVolume(this); + Volume volume = _storageMgr.allocVolume(this); if (volume != null) { this.setId(volume.getId()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create volume"); } } @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Volume volume = BaseCmd._storageMgr.createVolume(this); - VolumeResponse response = ApiResponseHelper.createVolumeResponse((VolumeVO)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()); - this.setResponseObject(response); + Volume volume = _storageMgr.createVolume(this); + if (volume != null) { + VolumeResponse response = ApiResponseHelper.createVolumeResponse((VolumeVO)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()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a volume"); + } } } diff --git a/server/src/com/cloud/api/commands/CreateZoneCmd.java b/server/src/com/cloud/api/commands/CreateZoneCmd.java index 1cbf36bf5a9..82509e8f544 100644 --- a/server/src/com/cloud/api/commands/CreateZoneCmd.java +++ b/server/src/com/cloud/api/commands/CreateZoneCmd.java @@ -123,9 +123,13 @@ public class CreateZoneCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DataCenter result = BaseCmd._configService.createZone(this); - ZoneResponse response = ApiResponseHelper.createZoneResponse((DataCenterVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + DataCenter result = _configService.createZone(this); + if (result != null){ + ZoneResponse response = ApiResponseHelper.createZoneResponse((DataCenterVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a zone"); + } } } diff --git a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java index ae65df0edf5..63296accb1e 100644 --- a/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java @@ -63,7 +63,7 @@ public class DeleteDiskOfferingCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._configService.deleteDiskOffering(this); + boolean result = _configService.deleteDiskOffering(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteDomainCmd.java b/server/src/com/cloud/api/commands/DeleteDomainCmd.java index 46312744fe1..ff2c656f2b4 100644 --- a/server/src/com/cloud/api/commands/DeleteDomainCmd.java +++ b/server/src/com/cloud/api/commands/DeleteDomainCmd.java @@ -95,7 +95,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._mgr.deleteDomain(this); + boolean result = _mgr.deleteDomain(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteHostCmd.java b/server/src/com/cloud/api/commands/DeleteHostCmd.java index a40f24957c5..dcc3b2246c2 100644 --- a/server/src/com/cloud/api/commands/DeleteHostCmd.java +++ b/server/src/com/cloud/api/commands/DeleteHostCmd.java @@ -67,7 +67,7 @@ public class DeleteHostCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._agentMgr.deleteHost(this); + boolean result = _agentMgr.deleteHost(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java b/server/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java index 0d04736c0c7..d8593f14520 100644 --- a/server/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java @@ -67,17 +67,13 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - try { - boolean result = false; - result = BaseCmd._networkMgr.deleteIpForwardingRule(id); - if (result) { - SuccessResponse response = new SuccessResponse(getName()); - this.setResponseObject(response); - } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete ip forwarding rule"); - } - } catch (Exception ex) { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); + boolean result = false; + result = _networkMgr.deleteIpForwardingRule(id); + if (result) { + SuccessResponse response = new SuccessResponse(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete ip forwarding rule"); } } diff --git a/server/src/com/cloud/api/commands/DeleteIsoCmd.java b/server/src/com/cloud/api/commands/DeleteIsoCmd.java index 07c1596f39c..301e8188181 100644 --- a/server/src/com/cloud/api/commands/DeleteIsoCmd.java +++ b/server/src/com/cloud/api/commands/DeleteIsoCmd.java @@ -99,7 +99,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._templateMgr.deleteIso(this); + boolean result = _templateMgr.deleteIso(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java index 2a5f893dd99..f1cbe79e105 100644 --- a/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java @@ -87,7 +87,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkMgr.deleteLoadBalancerRule(this); + boolean result = _networkMgr.deleteLoadBalancerRule(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java index aa9564a0ef3..dfec6c5f1da 100644 --- a/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java @@ -63,7 +63,7 @@ public class DeleteNetworkGroupCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try{ - boolean result = BaseCmd._networkGroupMgr.deleteNetworkGroup(this); + boolean result = _networkGroupMgr.deleteNetworkGroup(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeletePodCmd.java b/server/src/com/cloud/api/commands/DeletePodCmd.java index f843d0aab22..c33b456c277 100644 --- a/server/src/com/cloud/api/commands/DeletePodCmd.java +++ b/server/src/com/cloud/api/commands/DeletePodCmd.java @@ -64,7 +64,7 @@ public class DeletePodCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._configService.deletePod(this); + boolean result = _configService.deletePod(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeletePoolCmd.java b/server/src/com/cloud/api/commands/DeletePoolCmd.java index 54ae3859305..88ecaeb0e9c 100644 --- a/server/src/com/cloud/api/commands/DeletePoolCmd.java +++ b/server/src/com/cloud/api/commands/DeletePoolCmd.java @@ -47,7 +47,7 @@ public class DeletePoolCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._storageMgr.deletePool(this); + boolean result = _storageMgr.deletePool(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java b/server/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java index 3f0983d12f2..48bbb82b2a2 100644 --- a/server/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java @@ -63,7 +63,7 @@ public class DeletePortForwardingRuleCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkMgr.deletePortForwardingRule(id,false); + boolean result = _networkMgr.deletePortForwardingRule(id,false); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java index 0303a18a9e7..18494aa7d4c 100644 --- a/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java +++ b/server/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java @@ -59,7 +59,7 @@ public class DeletePreallocatedLunCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._mgr.unregisterPreallocatedLun(this); + boolean result = _mgr.unregisterPreallocatedLun(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java index 5eb4bc6f604..c16aeb4ffb7 100644 --- a/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java +++ b/server/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java @@ -113,7 +113,7 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkMgr.destroyRemoteAccessVpn(this); + boolean result = _networkMgr.destroyRemoteAccessVpn(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java index 1caae656577..738558b9726 100644 --- a/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java @@ -65,7 +65,7 @@ public class DeleteServiceOfferingCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._configService.deleteServiceOffering(this); + boolean result = _configService.deleteServiceOffering(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java index fc6826d7958..7b6c20aae06 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotCmd.java @@ -89,7 +89,7 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._snapshotMgr.deleteSnapshot(this); + boolean result = _snapshotMgr.deleteSnapshot(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java index cdb5a056ab8..6cb864a428d 100644 --- a/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java @@ -75,7 +75,7 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._snapshotMgr.deleteSnapshotPolicies(this); + boolean result = _snapshotMgr.deleteSnapshotPolicies(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java index cbbcb2c7ac8..23ac97e94d3 100644 --- a/server/src/com/cloud/api/commands/DeleteTemplateCmd.java +++ b/server/src/com/cloud/api/commands/DeleteTemplateCmd.java @@ -101,7 +101,7 @@ public class DeleteTemplateCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._templateMgr.deleteTemplate(this); + boolean result = _templateMgr.deleteTemplate(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteUserCmd.java b/server/src/com/cloud/api/commands/DeleteUserCmd.java index 80fdeec295a..abda77c7c6b 100644 --- a/server/src/com/cloud/api/commands/DeleteUserCmd.java +++ b/server/src/com/cloud/api/commands/DeleteUserCmd.java @@ -96,7 +96,7 @@ public class DeleteUserCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._accountService.deleteUser(this); + boolean result = _accountService.deleteUser(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java index 620a185a52e..2d336d1f1a8 100644 --- a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java @@ -62,7 +62,7 @@ public class DeleteVMGroupCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._userVmService.deleteVmGroup(this); + boolean result = _userVmService.deleteVmGroup(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java index 8d4f1091ccf..7327cec0030 100644 --- a/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java @@ -64,7 +64,7 @@ public class DeleteVlanIpRangeCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._configService.deleteVlanIpRange(this); + boolean result = _configService.deleteVlanIpRange(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java index a1aa319001e..b4b468f6646 100644 --- a/server/src/com/cloud/api/commands/DeleteVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVolumeCmd.java @@ -69,7 +69,7 @@ public class DeleteVolumeCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._storageMgr.deleteVolume(this); + boolean result = _storageMgr.deleteVolume(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeleteZoneCmd.java b/server/src/com/cloud/api/commands/DeleteZoneCmd.java index 65a99922534..efcecbb7f02 100644 --- a/server/src/com/cloud/api/commands/DeleteZoneCmd.java +++ b/server/src/com/cloud/api/commands/DeleteZoneCmd.java @@ -66,7 +66,7 @@ public class DeleteZoneCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._configService.deleteZone(this); + boolean result = _configService.deleteZone(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DeployVMCmd.java b/server/src/com/cloud/api/commands/DeployVMCmd.java index f7e25a6b7cb..3e7a3b7c0dd 100644 --- a/server/src/com/cloud/api/commands/DeployVMCmd.java +++ b/server/src/com/cloud/api/commands/DeployVMCmd.java @@ -201,19 +201,22 @@ public class DeployVMCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ try { - String password = null; if (templateId != null ) { VMTemplateVO template = ApiDBUtils.findTemplateById(templateId); if (template.getEnablePassword()) { - password = BaseCmd._mgr.generateRandomPassword(); + password = _mgr.generateRandomPassword(); } } - UserVm result = BaseCmd._mgr.deployVirtualMachine(this, password); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setPassword(password); - response.setResponseName(getName()); - this.setResponseObject(response); + UserVm result = _mgr.deployVirtualMachine(this, password); + if (result != null){ + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setPassword(password); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to deploy vm"); + } } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } catch (ExecutionException ex1) { diff --git a/server/src/com/cloud/api/commands/DeployVm2Cmd.java b/server/src/com/cloud/api/commands/DeployVm2Cmd.java index 8ccda666d68..1db00dc7290 100644 --- a/server/src/com/cloud/api/commands/DeployVm2Cmd.java +++ b/server/src/com/cloud/api/commands/DeployVm2Cmd.java @@ -159,17 +159,25 @@ public class DeployVm2Cmd extends BaseAsyncCreateCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ UserVm result; - result = BaseCmd._userVmService.startVirtualMachine(this); - UserVmResponse response = ApiResponseHelper.createUserVm2Response(result); - response.setPassword(password); - response.setResponseName(getName()); - this.setResponseObject(response); + result = _userVmService.startVirtualMachine(this); + if (result != null) { + UserVmResponse response = ApiResponseHelper.createUserVm2Response(result); + response.setPassword(password); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to deploy vm"); + } } @Override public void callCreate() throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { - UserVm vm = BaseCmd._userVmService.createVirtualMachine(this); - this.setId(vm.getId()); + UserVm vm = _userVmService.createVirtualMachine(this); + if (vm != null) { + this.setId(vm.getId()); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to deploy vm"); + } } diff --git a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java index 77a06a9f690..55325d742c6 100644 --- a/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/server/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java @@ -90,7 +90,7 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._consoleProxyMgr.destroyConsoleProxy(this); + boolean result = _consoleProxyMgr.destroyConsoleProxy(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/DestroyVMCmd.java b/server/src/com/cloud/api/commands/DestroyVMCmd.java index a658a27a7a7..b4e4997507e 100644 --- a/server/src/com/cloud/api/commands/DestroyVMCmd.java +++ b/server/src/com/cloud/api/commands/DestroyVMCmd.java @@ -90,9 +90,13 @@ public class DestroyVMCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ - UserVm result = BaseCmd._userVmService.destroyVm(this); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setResponseName("virtualmachine"); - this.setResponseObject(response); + UserVm result = _userVmService.destroyVm(this); + if (result != null) { + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName("virtualmachine"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to destroy vm"); + } } } diff --git a/server/src/com/cloud/api/commands/DetachIsoCmd.java b/server/src/com/cloud/api/commands/DetachIsoCmd.java index 01eb11d7989..8a9a3044e6d 100755 --- a/server/src/com/cloud/api/commands/DetachIsoCmd.java +++ b/server/src/com/cloud/api/commands/DetachIsoCmd.java @@ -27,7 +27,6 @@ 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.api.response.UserVmResponse; import com.cloud.event.EventTypes; import com.cloud.exception.ConcurrentOperationException; @@ -35,7 +34,6 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; -import com.cloud.storage.VMTemplateVO; import com.cloud.user.Account; import com.cloud.uservm.UserVm; @@ -91,7 +89,7 @@ public class DetachIsoCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._templateMgr.detachIso(this); + boolean result = _templateMgr.detachIso(this); if (result) { UserVm userVm = ApiDBUtils.findUserVmById(virtualMachineId); UserVmResponse response = ApiResponseHelper.createUserVmResponse(userVm); diff --git a/server/src/com/cloud/api/commands/DetachVolumeCmd.java b/server/src/com/cloud/api/commands/DetachVolumeCmd.java index 7a0af86cffa..ffc7c5ad381 100755 --- a/server/src/com/cloud/api/commands/DetachVolumeCmd.java +++ b/server/src/com/cloud/api/commands/DetachVolumeCmd.java @@ -125,9 +125,13 @@ public class DetachVolumeCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Volume result = BaseCmd._userVmService.detachVolumeFromVM(this); - VolumeResponse response = ApiResponseHelper.createVolumeResponse((VolumeVO)result); - response.setResponseName("volume"); - this.setResponseObject(response); + Volume result = _userVmService.detachVolumeFromVM(this); + if (result != null){ + VolumeResponse response = ApiResponseHelper.createVolumeResponse((VolumeVO)result); + response.setResponseName("volume"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to detach volume"); + } } } \ 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 cfc284e4cf1..4b140a534f5 100644 --- a/server/src/com/cloud/api/commands/DisableAccountCmd.java +++ b/server/src/com/cloud/api/commands/DisableAccountCmd.java @@ -94,9 +94,13 @@ public class DisableAccountCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Account result = BaseCmd._accountService.disableAccount(this); - AccountResponse response = ApiResponseHelper.createAccountResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + Account result = _accountService.disableAccount(this); + if (result != null){ + AccountResponse response = ApiResponseHelper.createAccountResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disable account"); + } } } diff --git a/server/src/com/cloud/api/commands/DisableUserCmd.java b/server/src/com/cloud/api/commands/DisableUserCmd.java index f80f8ce3677..d26d5397c78 100644 --- a/server/src/com/cloud/api/commands/DisableUserCmd.java +++ b/server/src/com/cloud/api/commands/DisableUserCmd.java @@ -89,9 +89,13 @@ public class DisableUserCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - UserAccount user = BaseCmd._accountService.disableUser(this); - UserResponse response = ApiResponseHelper.createUserResponse(user); - response.setResponseName(getName()); - this.setResponseObject(response); + UserAccount user = _accountService.disableUser(this); + if (user != null){ + UserResponse response = ApiResponseHelper.createUserResponse(user); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disable user"); + } } } diff --git a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java index 79fd5d60bff..a466fb1cf0c 100644 --- a/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java +++ b/server/src/com/cloud/api/commands/DisassociateIPAddrCmd.java @@ -63,7 +63,7 @@ public class DisassociateIPAddrCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkMgr.disassociateIpAddress(this); + boolean result = _networkMgr.disassociateIpAddress(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/EnableAccountCmd.java b/server/src/com/cloud/api/commands/EnableAccountCmd.java index bc34cb0630e..6c85bbfcc6a 100644 --- a/server/src/com/cloud/api/commands/EnableAccountCmd.java +++ b/server/src/com/cloud/api/commands/EnableAccountCmd.java @@ -71,9 +71,13 @@ public class EnableAccountCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Account result = BaseCmd._accountService.enableAccount(this); - AccountResponse response = ApiResponseHelper.createAccountResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + Account result = _accountService.enableAccount(this); + if (result != null){ + AccountResponse response = ApiResponseHelper.createAccountResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to enable account"); + } } } diff --git a/server/src/com/cloud/api/commands/EnableUserCmd.java b/server/src/com/cloud/api/commands/EnableUserCmd.java index c47e979b506..e45959e7c7a 100644 --- a/server/src/com/cloud/api/commands/EnableUserCmd.java +++ b/server/src/com/cloud/api/commands/EnableUserCmd.java @@ -66,9 +66,13 @@ public class EnableUserCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - UserAccount user = BaseCmd._accountService.enableUser(this); - UserResponse response = ApiResponseHelper.createUserResponse(user); - response.setResponseName(getName()); - this.setResponseObject(response); + UserAccount user = _accountService.enableUser(this); + if (user != null){ + UserResponse response = ApiResponseHelper.createUserResponse(user); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to enable user"); + } } } diff --git a/server/src/com/cloud/api/commands/ExtractIsoCmd.java b/server/src/com/cloud/api/commands/ExtractIsoCmd.java index 4e71b112455..23c0428fce1 100755 --- a/server/src/com/cloud/api/commands/ExtractIsoCmd.java +++ b/server/src/com/cloud/api/commands/ExtractIsoCmd.java @@ -117,23 +117,27 @@ public class ExtractIsoCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ try { - Long uploadId = BaseCmd._templateMgr.extract(this); - UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); - ExtractResponse response = new ExtractResponse(); - response.setId(id); - response.setName(ApiDBUtils.findTemplateById(id).getName()); - response.setZoneId(zoneId); - response.setZoneName(ApiDBUtils.findZoneById(zoneId).getName()); - response.setMode(mode); - response.setUploadId(uploadId); - response.setState(uploadInfo.getUploadState().toString()); - response.setAccountId(getAccountId()); - //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"); - this.setResponseObject(response); + Long uploadId = _templateMgr.extract(this); + if (uploadId != null){ + UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); + ExtractResponse response = new ExtractResponse(); + response.setId(id); + response.setName(ApiDBUtils.findTemplateById(id).getName()); + response.setZoneId(zoneId); + response.setZoneName(ApiDBUtils.findZoneById(zoneId).getName()); + response.setMode(mode); + response.setUploadId(uploadId); + response.setState(uploadInfo.getUploadState().toString()); + response.setAccountId(getAccountId()); + //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"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to extract iso"); + } } catch (InternalErrorException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java index a801dd7c746..23da263f118 100755 --- a/server/src/com/cloud/api/commands/ExtractTemplateCmd.java +++ b/server/src/com/cloud/api/commands/ExtractTemplateCmd.java @@ -118,24 +118,27 @@ public class ExtractTemplateCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ try { - Long uploadId = BaseCmd._templateMgr.extract(this); - UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); - - ExtractResponse response = new ExtractResponse(); - response.setResponseName(getName()); - response.setObjectName("template"); - response.setId(id); - response.setName(ApiDBUtils.findTemplateById(id).getName()); - response.setZoneId(zoneId); - response.setZoneName(ApiDBUtils.findZoneById(zoneId).getName()); - response.setMode(mode); - response.setUploadId(uploadId); - response.setState(uploadInfo.getUploadState().toString()); - response.setAccountId(getAccountId()); - //FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. - //response.setUrl(uploadInfo.getUploadUrl()); - response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); - this.setResponseObject(response); + Long uploadId = _templateMgr.extract(this); + if (uploadId != null){ + UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); + ExtractResponse response = new ExtractResponse(); + response.setResponseName(getName()); + response.setObjectName("template"); + response.setId(id); + response.setName(ApiDBUtils.findTemplateById(id).getName()); + response.setZoneId(zoneId); + response.setZoneName(ApiDBUtils.findZoneById(zoneId).getName()); + response.setMode(mode); + response.setUploadId(uploadId); + response.setState(uploadInfo.getUploadState().toString()); + response.setAccountId(getAccountId()); + //FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. + //response.setUrl(uploadInfo.getUploadUrl()); + response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to extract template"); + } } catch (InternalErrorException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java index dcf61eaddf8..9b92954996a 100755 --- a/server/src/com/cloud/api/commands/ExtractVolumeCmd.java +++ b/server/src/com/cloud/api/commands/ExtractVolumeCmd.java @@ -122,23 +122,26 @@ public class ExtractVolumeCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ try { - Long uploadId = BaseCmd._mgr.extractVolume(this); - UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); - - ExtractResponse response = new ExtractResponse(); - response.setResponseName(getName()); - response.setObjectName("volume"); - response.setId(id); - response.setName(ApiDBUtils.findVolumeById(id).getName()); - response.setZoneId(zoneId); - response.setZoneName(ApiDBUtils.findZoneById(zoneId).getName()); - response.setMode(mode); - response.setUploadId(uploadId); - response.setState(uploadInfo.getUploadState().toString()); - response.setAccountId(getAccountId()); - //FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. - response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); - this.setResponseObject(response); + Long uploadId = _mgr.extractVolume(this); + if (uploadId != null){ + UploadVO uploadInfo = ApiDBUtils.findUploadById(uploadId); + ExtractResponse response = new ExtractResponse(); + response.setResponseName(getName()); + response.setObjectName("volume"); + response.setId(id); + response.setName(ApiDBUtils.findVolumeById(id).getName()); + response.setZoneId(zoneId); + response.setZoneName(ApiDBUtils.findZoneById(zoneId).getName()); + response.setMode(mode); + response.setUploadId(uploadId); + response.setState(uploadInfo.getUploadState().toString()); + response.setAccountId(getAccountId()); + //FIX ME - Need to set the url once the gson jar is upgraded since it is throwing an error right now. + response.setUrl(uploadInfo.getUploadUrl().replaceAll("/", "%2F")); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to extract volume"); + } } catch (URISyntaxException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java index e9cb125cc71..d653e4d66c4 100644 --- a/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java +++ b/server/src/com/cloud/api/commands/GetCloudIdentifierCmd.java @@ -66,14 +66,14 @@ public class GetCloudIdentifierCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - ArrayList result = BaseCmd._mgr.getCloudIdentifierResponse(this); + ArrayList result = _mgr.getCloudIdentifierResponse(this); CloudIdentifierResponse response = new CloudIdentifierResponse(); if (result != null) { response.setCloudIdentifier(result.get(0)); response.setSignature(result.get(1)); } else { - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config"); + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to get cloud identifier"); } response.setObjectName("cloudidentifier"); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/ListAccountsCmd.java b/server/src/com/cloud/api/commands/ListAccountsCmd.java index ab8f63803ab..91feeedc063 100644 --- a/server/src/com/cloud/api/commands/ListAccountsCmd.java +++ b/server/src/com/cloud/api/commands/ListAccountsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -112,7 +111,7 @@ public class ListAccountsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List accounts = BaseCmd._mgr.searchForAccounts(this); + List accounts = _mgr.searchForAccounts(this); ListResponse response = new ListResponse(); List accountResponses = new ArrayList(); for (AccountVO account : accounts) { diff --git a/server/src/com/cloud/api/commands/ListAlertsCmd.java b/server/src/com/cloud/api/commands/ListAlertsCmd.java index 7d8ccf781f8..591cbd45398 100644 --- a/server/src/com/cloud/api/commands/ListAlertsCmd.java +++ b/server/src/com/cloud/api/commands/ListAlertsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.alert.AlertVO; import com.cloud.api.ApiConstants; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -70,7 +69,7 @@ public class ListAlertsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForAlerts(this); + List result = _mgr.searchForAlerts(this); ListResponse response = new ListResponse(); List alertResponseList = new ArrayList(); for (AlertVO alert : result) { diff --git a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java index 28aeaf1466f..07cb0bbfeba 100644 --- a/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java +++ b/server/src/com/cloud/api/commands/ListAsyncJobsCmd.java @@ -23,7 +23,6 @@ import java.util.List; import com.cloud.api.ApiConstants; import com.cloud.api.ApiSerializerHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -82,7 +81,7 @@ public class ListAsyncJobsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForAsyncJobs(this); + List result = _mgr.searchForAsyncJobs(this); ListResponse response = new ListResponse(); List jobResponses = new ArrayList(); for (AsyncJobVO job : result) { diff --git a/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java b/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java index b87c3dc869e..c0c2fd2cfd6 100644 --- a/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java +++ b/server/src/com/cloud/api/commands/ListCapabilitiesCmd.java @@ -44,7 +44,7 @@ public class ListCapabilitiesCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Map capabilities = BaseCmd._mgr.listCapabilities(this); + Map capabilities = _mgr.listCapabilities(this); CapabilitiesResponse response = new CapabilitiesResponse(); response.setNetworkGroupsEnabled(capabilities.get("networkGroupsEnabled")); response.setCloudStackVersion(capabilities.get("cloudStackVersion")); diff --git a/server/src/com/cloud/api/commands/ListCapacityCmd.java b/server/src/com/cloud/api/commands/ListCapacityCmd.java index da04ea01a98..c4ffd2f5cf7 100644 --- a/server/src/com/cloud/api/commands/ListCapacityCmd.java +++ b/server/src/com/cloud/api/commands/ListCapacityCmd.java @@ -31,7 +31,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -202,7 +201,7 @@ public class ListCapacityCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.listCapacities(this); + List result = _mgr.listCapacities(this); ListResponse response = new ListResponse(); List capacityResponses = new ArrayList(); List summedCapacities = sumCapacities(result); diff --git a/server/src/com/cloud/api/commands/ListCfgsByCmd.java b/server/src/com/cloud/api/commands/ListCfgsByCmd.java index 768e761436a..5a00c470932 100644 --- a/server/src/com/cloud/api/commands/ListCfgsByCmd.java +++ b/server/src/com/cloud/api/commands/ListCfgsByCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -80,7 +79,7 @@ public class ListCfgsByCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForConfigurations(this); + List result = _mgr.searchForConfigurations(this); ListResponse response = new ListResponse(); List configResponses = new ArrayList(); for (ConfigurationVO cfg : result) { diff --git a/server/src/com/cloud/api/commands/ListClustersCmd.java b/server/src/com/cloud/api/commands/ListClustersCmd.java index 89e9355b259..2d22c9f0916 100644 --- a/server/src/com/cloud/api/commands/ListClustersCmd.java +++ b/server/src/com/cloud/api/commands/ListClustersCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -93,7 +92,7 @@ public class ListClustersCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForClusters(this); + List result = _mgr.searchForClusters(this); ListResponse response = new ListResponse(); List clusterResponses = new ArrayList(); for (ClusterVO cluster : result) { diff --git a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java index 843f65d2c2b..d4feed5a577 100644 --- a/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListDiskOfferingsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -84,7 +83,7 @@ public class ListDiskOfferingsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForDiskOfferings(this); + List result = _mgr.searchForDiskOfferings(this); ListResponse response = new ListResponse(); List diskOfferingResponses = new ArrayList(); for (DiskOfferingVO offering : result) { diff --git a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java index 77d1f81dc5b..be75c799728 100644 --- a/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainChildrenCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -84,7 +83,7 @@ public class ListDomainChildrenCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForDomainChildren(this); + List result = _mgr.searchForDomainChildren(this); ListResponse response = new ListResponse(); List domainResponses = new ArrayList(); for (DomainVO domain : result) { diff --git a/server/src/com/cloud/api/commands/ListDomainsCmd.java b/server/src/com/cloud/api/commands/ListDomainsCmd.java index b22ab4dadd4..82a992f3fb3 100644 --- a/server/src/com/cloud/api/commands/ListDomainsCmd.java +++ b/server/src/com/cloud/api/commands/ListDomainsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -84,7 +83,7 @@ public class ListDomainsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForDomains(this); + List result = _mgr.searchForDomains(this); ListResponse response = new ListResponse(); List domainResponses = new ArrayList(); for (DomainVO domain : result) { diff --git a/server/src/com/cloud/api/commands/ListEventsCmd.java b/server/src/com/cloud/api/commands/ListEventsCmd.java index 41ff397ec9d..049aaeee472 100644 --- a/server/src/com/cloud/api/commands/ListEventsCmd.java +++ b/server/src/com/cloud/api/commands/ListEventsCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -121,7 +120,7 @@ public class ListEventsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForEvents(this); + List result = _mgr.searchForEvents(this); ListResponse response = new ListResponse(); List eventResponses = new ArrayList(); for (EventVO event : result) { diff --git a/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java b/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java index c49ff9082fa..ea750cb7227 100644 --- a/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java +++ b/server/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -72,7 +71,7 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.listGuestOSCategoriesByCriteria(this); + List result = _mgr.listGuestOSCategoriesByCriteria(this); ListResponse response = new ListResponse(); List osCatResponses = new ArrayList(); for (GuestOSCategoryVO osCategory : result) { diff --git a/server/src/com/cloud/api/commands/ListGuestOsCmd.java b/server/src/com/cloud/api/commands/ListGuestOsCmd.java index c2fc7578412..eeab4789efd 100644 --- a/server/src/com/cloud/api/commands/ListGuestOsCmd.java +++ b/server/src/com/cloud/api/commands/ListGuestOsCmd.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -89,7 +88,7 @@ public class ListGuestOsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.listGuestOSByCriteria(this); + List result = _mgr.listGuestOSByCriteria(this); ListResponse response = new ListResponse(); List osResponses = new ArrayList(); for (GuestOSVO guestOS : result) { diff --git a/server/src/com/cloud/api/commands/ListHostsCmd.java b/server/src/com/cloud/api/commands/ListHostsCmd.java index 1efcc208a01..6634c810cbe 100644 --- a/server/src/com/cloud/api/commands/ListHostsCmd.java +++ b/server/src/com/cloud/api/commands/ListHostsCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -115,7 +114,7 @@ public class ListHostsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForServers(this); + List result = _mgr.searchForServers(this); ListResponse response = new ListResponse(); List hostResponses = new ArrayList(); diff --git a/server/src/com/cloud/api/commands/ListHypervisorsCmd.java b/server/src/com/cloud/api/commands/ListHypervisorsCmd.java index 7c01b9b1b07..06f711b7480 100644 --- a/server/src/com/cloud/api/commands/ListHypervisorsCmd.java +++ b/server/src/com/cloud/api/commands/ListHypervisorsCmd.java @@ -44,7 +44,7 @@ public class ListHypervisorsCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - String[] result = BaseCmd._mgr.getHypervisors(this); + String[] result = _mgr.getHypervisors(this); ListResponse response = new ListResponse(); ArrayList responses = new ArrayList(); for (String hypervisor : result) { diff --git a/server/src/com/cloud/api/commands/ListIsosCmd.java b/server/src/com/cloud/api/commands/ListIsosCmd.java index 88a5948cdcb..2b9e07821d8 100755 --- a/server/src/com/cloud/api/commands/ListIsosCmd.java +++ b/server/src/com/cloud/api/commands/ListIsosCmd.java @@ -27,7 +27,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -149,7 +148,7 @@ public class ListIsosCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List isos = BaseCmd._mgr.listIsos(this); + List isos = _mgr.listIsos(this); TemplateFilter isoFilterObj = null; try { diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java index c89fa04c340..337ac2198eb 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -77,7 +76,7 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.listLoadBalancerInstances(this); + List result = _mgr.listLoadBalancerInstances(this); ListResponse response = new ListResponse(); List vmResponses = new ArrayList(); for (UserVmVO instance : result) { diff --git a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java index 50ea29453ac..1eb881618cd 100644 --- a/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -106,7 +105,7 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List loadBalancers = BaseCmd._mgr.searchForLoadBalancers(this); + List loadBalancers = _mgr.searchForLoadBalancers(this); ListResponse response = new ListResponse(); List lbResponses = new ArrayList(); for (LoadBalancerVO loadBalancer : loadBalancers) { diff --git a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java index 9cbced1b7d2..ec06e10cb05 100644 --- a/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListNetworkGroupsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -94,7 +93,7 @@ public class ListNetworkGroupsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List networkGroups = BaseCmd._networkGroupMgr.searchForNetworkGroupRules(this); + List networkGroups = _networkGroupMgr.searchForNetworkGroupRules(this); List groupResultObjs = NetworkGroupResultObject.transposeNetworkGroups(networkGroups); ListResponse response = new ListResponse(); diff --git a/server/src/com/cloud/api/commands/ListPodsByCmd.java b/server/src/com/cloud/api/commands/ListPodsByCmd.java index 798013358a8..80e2f7f9397 100644 --- a/server/src/com/cloud/api/commands/ListPodsByCmd.java +++ b/server/src/com/cloud/api/commands/ListPodsByCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -86,7 +85,7 @@ public class ListPodsByCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForPods(this); + List result = _mgr.searchForPods(this); ListResponse response = new ListResponse(); List podResponses = new ArrayList(); for (HostPodVO pod : result) { diff --git a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java index e4f21c8ad0d..d31d58b9b94 100644 --- a/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java +++ b/server/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -70,7 +69,7 @@ public class ListPortForwardingRulesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._networkMgr.listPortForwardingRules(this); + List result = _networkMgr.listPortForwardingRules(this); ListResponse response = new ListResponse(); List fwResponses = new ArrayList(); diff --git a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java index 854831fadee..84ca955a97f 100644 --- a/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java +++ b/server/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -80,7 +79,7 @@ public class ListPreallocatedLunsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List preallocatedLuns = BaseCmd._mgr.getPreAllocatedLuns(this); + List preallocatedLuns = _mgr.getPreAllocatedLuns(this); ListResponse response = new ListResponse(); List lunResponses = new ArrayList(); for (PreallocatedLunVO preallocatedLun : preallocatedLuns) { diff --git a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java index 19ae41c264b..5e56f77e257 100644 --- a/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java +++ b/server/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -113,7 +112,7 @@ public class ListPublicIpAddressesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForIPAddresses(this); + List result = _mgr.searchForIPAddresses(this); ListResponse response = new ListResponse(); List ipAddrResponses = new ArrayList(); for (IPAddressVO ipAddress : result) { diff --git a/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java b/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java index 59d36e41d2b..59c22a00d65 100644 --- a/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java +++ b/server/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import com.cloud.api.ApiConstants; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -72,7 +71,7 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List snapshotSchedules = BaseCmd._snapshotMgr.findRecurringSnapshotSchedule(this); + List snapshotSchedules = _snapshotMgr.findRecurringSnapshotSchedule(this); ListResponse response = new ListResponse(); List snapshotScheduleResponses = new ArrayList(); for (SnapshotScheduleVO snapshotSchedule : snapshotSchedules) { diff --git a/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java b/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java index 7c52dd53e1a..65b87241d64 100644 --- a/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java +++ b/server/src/com/cloud/api/commands/ListRemoteAccessVpnsCmd.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -105,7 +104,7 @@ public class ListRemoteAccessVpnsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List vpns = BaseCmd._mgr.searchForRemoteAccessVpns(this); + List vpns = _mgr.searchForRemoteAccessVpns(this); ListResponse response = new ListResponse(); List vpnResponses = new ArrayList(); for (RemoteAccessVpnVO vpn : vpns) { diff --git a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java index 27c683aa004..615019e546d 100644 --- a/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java +++ b/server/src/com/cloud/api/commands/ListResourceLimitsCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -97,7 +96,7 @@ public class ListResourceLimitsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._accountService.searchForLimits(this); + List result = _accountService.searchForLimits(this); ListResponse response = new ListResponse(); List limitResponses = new ArrayList(); for (ResourceLimit limit : result) { diff --git a/server/src/com/cloud/api/commands/ListRoutersCmd.java b/server/src/com/cloud/api/commands/ListRoutersCmd.java index 3a10ad124cb..4e0b7653742 100644 --- a/server/src/com/cloud/api/commands/ListRoutersCmd.java +++ b/server/src/com/cloud/api/commands/ListRoutersCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -114,7 +113,7 @@ public class ListRoutersCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForRouters(this); + List result = _mgr.searchForRouters(this); ListResponse response = new ListResponse(); List routerResponses = new ArrayList(); for (DomainRouter router : result) { diff --git a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java index db7177ffb45..ff653a370ca 100644 --- a/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java +++ b/server/src/com/cloud/api/commands/ListServiceOfferingsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -84,7 +83,7 @@ public class ListServiceOfferingsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List offerings = BaseCmd._mgr.searchForServiceOfferings(this); + List offerings = _mgr.searchForServiceOfferings(this); ListResponse response = new ListResponse(); List offeringResponses = new ArrayList(); for (ServiceOfferingVO offering : offerings) { diff --git a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java index 186d0a637db..1564964dcbb 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotPoliciesCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -85,7 +84,7 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._snapshotMgr.listPoliciesforVolume(this); + List result = _snapshotMgr.listPoliciesforVolume(this); ListResponse response = new ListResponse(); List policyResponses = new ArrayList(); for (SnapshotPolicyVO policy : result) { diff --git a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java index 44532cad4b9..08f069ed254 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -113,7 +112,7 @@ public class ListSnapshotsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.listSnapshots(this); + List result = _mgr.listSnapshots(this); ListResponse response = new ListResponse(); List snapshotResponses = new ArrayList(); for (Snapshot snapshot : result) { diff --git a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java index c72f17a0fda..db5f52aa2e2 100644 --- a/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java +++ b/server/src/com/cloud/api/commands/ListStoragePoolsCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -106,7 +105,7 @@ public class ListStoragePoolsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List pools = BaseCmd._mgr.searchForStoragePools(this); + List pools = _mgr.searchForStoragePools(this); ListResponse response = new ListResponse(); List poolResponses = new ArrayList(); for (StoragePoolVO pool : pools) { diff --git a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java index ba78bbd5186..be98c208140 100644 --- a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -112,7 +111,7 @@ public class ListSystemVMsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List systemVMs = BaseCmd._mgr.searchForSystemVm(this); + List systemVMs = _mgr.searchForSystemVm(this); ListResponse response = new ListResponse(); List vmResponses = new ArrayList(); for (VMInstanceVO systemVM : systemVMs) { diff --git a/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java index 90c7ebc6873..1c35d9b0096 100644 --- a/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplateOrIsoPermissionsCmd.java @@ -23,7 +23,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -95,7 +94,7 @@ public class ListTemplateOrIsoPermissionsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List accountNames = BaseCmd._mgr.listTemplatePermissions(this); + List accountNames = _mgr.listTemplatePermissions(this); Account account = (Account)UserContext.current().getAccount(); boolean isAdmin = ((account == null) || isAdmin(account.getType())); Long templateOwnerDomain = null; diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index 102eedff9c0..a2b35a02a03 100644 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -127,7 +126,7 @@ public class ListTemplatesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List templates = BaseCmd._mgr.listTemplates(this); + List templates = _mgr.listTemplates(this); TemplateFilter templateFilterObj; try { templateFilterObj = TemplateFilter.valueOf(templateFilter); diff --git a/server/src/com/cloud/api/commands/ListUsersCmd.java b/server/src/com/cloud/api/commands/ListUsersCmd.java index bfbe2ad5f5c..a36ed724555 100644 --- a/server/src/com/cloud/api/commands/ListUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListUsersCmd.java @@ -106,7 +106,7 @@ public class ListUsersCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForUsers(this); + List result = _mgr.searchForUsers(this); ListResponse response = new ListResponse(); List userResponses = new ArrayList(); for (UserAccountVO user : result) { diff --git a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java index c6aaedd32bf..c883fbfc096 100644 --- a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -91,7 +90,7 @@ public class ListVMGroupsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List groups = BaseCmd._mgr.searchForVmGroups(this); + List groups = _mgr.searchForVmGroups(this); ListResponse response = new ListResponse(); List responses = new ArrayList(); for (InstanceGroupVO group : groups) { diff --git a/server/src/com/cloud/api/commands/ListVMsCmd.java b/server/src/com/cloud/api/commands/ListVMsCmd.java index 38c2795c91b..a7dd18b5a47 100644 --- a/server/src/com/cloud/api/commands/ListVMsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMsCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -127,7 +126,7 @@ public class ListVMsCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List result = BaseCmd._mgr.searchForUserVMs(this); + List result = _mgr.searchForUserVMs(this); ListResponse response = new ListResponse(); List vmResponses = new ArrayList(); for (UserVm userVm : result) { diff --git a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java index fa28d0fd909..759e271d1ad 100644 --- a/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java +++ b/server/src/com/cloud/api/commands/ListVlanIpRangesCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -105,7 +104,7 @@ public class ListVlanIpRangesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List vlans = BaseCmd._mgr.searchForVlans(this); + List vlans = _mgr.searchForVlans(this); ListResponse response = new ListResponse(); List vlanResponses = new ArrayList(); for (VlanVO vlan : vlans) { diff --git a/server/src/com/cloud/api/commands/ListVolumesCmd.java b/server/src/com/cloud/api/commands/ListVolumesCmd.java index 74bd7303c0d..b2206505c37 100755 --- a/server/src/com/cloud/api/commands/ListVolumesCmd.java +++ b/server/src/com/cloud/api/commands/ListVolumesCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -126,7 +125,7 @@ public class ListVolumesCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List volumes = BaseCmd._mgr.searchForVolumes(this); + List volumes = _mgr.searchForVolumes(this); ListResponse response = new ListResponse(); List volResponses = new ArrayList(); diff --git a/server/src/com/cloud/api/commands/ListVpnUsersCmd.java b/server/src/com/cloud/api/commands/ListVpnUsersCmd.java index 5a77368be96..adaffda6173 100644 --- a/server/src/com/cloud/api/commands/ListVpnUsersCmd.java +++ b/server/src/com/cloud/api/commands/ListVpnUsersCmd.java @@ -24,7 +24,6 @@ import java.util.List; import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -92,7 +91,7 @@ public class ListVpnUsersCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List vpnUsers = BaseCmd._mgr.searchForVpnUsers(this); + List vpnUsers = _mgr.searchForVpnUsers(this); ListResponse response = new ListResponse(); List vpnResponses = new ArrayList(); diff --git a/server/src/com/cloud/api/commands/ListZonesByCmd.java b/server/src/com/cloud/api/commands/ListZonesByCmd.java index ebba4d5bb4e..418e0089585 100644 --- a/server/src/com/cloud/api/commands/ListZonesByCmd.java +++ b/server/src/com/cloud/api/commands/ListZonesByCmd.java @@ -24,7 +24,6 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiConstants; import com.cloud.api.ApiResponseHelper; -import com.cloud.api.BaseCmd; import com.cloud.api.BaseListCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; @@ -82,7 +81,7 @@ public class ListZonesByCmd extends BaseListCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - List dataCenters = BaseCmd._mgr.listDataCenters(this); + List dataCenters = _mgr.listDataCenters(this); ListResponse response = new ListResponse(); List zoneResponses = new ArrayList(); for (DataCenterVO dataCenter : dataCenters) { diff --git a/server/src/com/cloud/api/commands/LockAccountCmd.java b/server/src/com/cloud/api/commands/LockAccountCmd.java index cf426275973..d69f3c37279 100644 --- a/server/src/com/cloud/api/commands/LockAccountCmd.java +++ b/server/src/com/cloud/api/commands/LockAccountCmd.java @@ -72,9 +72,13 @@ public class LockAccountCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Account result = BaseCmd._accountService.lockAccount(this); - AccountResponse response = ApiResponseHelper.createAccountResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + Account result = _accountService.lockAccount(this); + if (result != null){ + AccountResponse response = ApiResponseHelper.createAccountResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to lock account"); + } } } diff --git a/server/src/com/cloud/api/commands/LockUserCmd.java b/server/src/com/cloud/api/commands/LockUserCmd.java index 62a5ef4d70f..7a9ee410ea3 100644 --- a/server/src/com/cloud/api/commands/LockUserCmd.java +++ b/server/src/com/cloud/api/commands/LockUserCmd.java @@ -65,10 +65,13 @@ public class LockUserCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - UserAccount user = BaseCmd._accountService.lockUser(this); - UserResponse response = ApiResponseHelper.createUserResponse(user); - response.setResponseName(getName()); - - this.setResponseObject(response); + UserAccount user = _accountService.lockUser(this); + if (user != null){ + UserResponse response = ApiResponseHelper.createUserResponse(user); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to lock user"); + } } } diff --git a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java index 59606d223c2..82881e3705d 100644 --- a/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PrepareForMaintenanceCmd.java @@ -93,9 +93,13 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - HostVO result = BaseCmd._agentMgr.maintain(this); - HostResponse response = ApiResponseHelper.createHostResponse(result); - response.setResponseName("host"); - this.setResponseObject(response); + HostVO result = _agentMgr.maintain(this); + if (result != null){ + HostResponse response = ApiResponseHelper.createHostResponse(result); + response.setResponseName("host"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to prepare host for maintenance"); + } } } diff --git a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java index 5ce56dd3bdd..cfbc1747a77 100644 --- a/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java +++ b/server/src/com/cloud/api/commands/PreparePrimaryStorageForMaintenanceCmd.java @@ -92,9 +92,13 @@ public class PreparePrimaryStorageForMaintenanceCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - StoragePoolVO result = BaseCmd._storageMgr.preparePrimaryStorageForMaintenance(this); - StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); - response.setResponseName("storagepool"); - this.setResponseObject(response); + StoragePoolVO result = _storageMgr.preparePrimaryStorageForMaintenance(this); + if (result != null){ + StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); + response.setResponseName("storagepool"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to prepare primary storage for maintenance"); + } } } diff --git a/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java b/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java index edc0d4d4015..f015004f019 100644 --- a/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java +++ b/server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java @@ -69,7 +69,7 @@ public class QueryAsyncJobResultCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - AsyncJobResult result = BaseCmd._asyncMgr.queryAsyncJobResult(this); + AsyncJobResult result = _asyncMgr.queryAsyncJobResult(this); AsyncJobResponse response = new AsyncJobResponse(); response.setId(result.getJobId()); response.setJobStatus(result.getJobStatus()); diff --git a/server/src/com/cloud/api/commands/RebootRouterCmd.java b/server/src/com/cloud/api/commands/RebootRouterCmd.java index 56833acf886..91be097d344 100644 --- a/server/src/com/cloud/api/commands/RebootRouterCmd.java +++ b/server/src/com/cloud/api/commands/RebootRouterCmd.java @@ -91,9 +91,13 @@ public class RebootRouterCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DomainRouter result = BaseCmd._networkMgr.rebootRouter(this); - DomainRouterResponse response = ApiResponseHelper.createDomainRouterResponse(result); - response.setResponseName("router"); - this.setResponseObject(response); + DomainRouter result = _networkMgr.rebootRouter(this); + if (result != null){ + DomainRouterResponse response = ApiResponseHelper.createDomainRouterResponse(result); + response.setResponseName("router"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to reboot router"); + } } } diff --git a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java index bae4c5d2f6f..f7d66429b7c 100644 --- a/server/src/com/cloud/api/commands/RebootSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/RebootSystemVmCmd.java @@ -90,9 +90,13 @@ public class RebootSystemVmCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - VMInstanceVO result = BaseCmd._mgr.rebootSystemVM(this); - SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + VMInstanceVO result = _mgr.rebootSystemVM(this); + if (result != null) { + SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Fail to reboot system vm"); + } } } diff --git a/server/src/com/cloud/api/commands/RebootVMCmd.java b/server/src/com/cloud/api/commands/RebootVMCmd.java index 23a542d1e64..d79480359be 100644 --- a/server/src/com/cloud/api/commands/RebootVMCmd.java +++ b/server/src/com/cloud/api/commands/RebootVMCmd.java @@ -89,9 +89,13 @@ public class RebootVMCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ - UserVm result = BaseCmd._userVmService.rebootVirtualMachine(this); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + UserVm result = _userVmService.rebootVirtualMachine(this); + if (result !=null){ + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to reboot vm instance"); + } } } diff --git a/server/src/com/cloud/api/commands/ReconnectHostCmd.java b/server/src/com/cloud/api/commands/ReconnectHostCmd.java index e49bc61edfc..1722b22e60c 100644 --- a/server/src/com/cloud/api/commands/ReconnectHostCmd.java +++ b/server/src/com/cloud/api/commands/ReconnectHostCmd.java @@ -96,10 +96,14 @@ public class ReconnectHostCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - HostVO result = BaseCmd._agentMgr.reconnectHost(this); - HostResponse response = ApiResponseHelper.createHostResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + HostVO result = _agentMgr.reconnectHost(this); + if (result != null){ + HostResponse response = ApiResponseHelper.createHostResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to reconnect host"); + } } catch (AgentUnavailableException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/RecoverVMCmd.java b/server/src/com/cloud/api/commands/RecoverVMCmd.java index b450f308fb6..ab79bd89193 100644 --- a/server/src/com/cloud/api/commands/RecoverVMCmd.java +++ b/server/src/com/cloud/api/commands/RecoverVMCmd.java @@ -69,10 +69,14 @@ public class RecoverVMCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ try { - UserVm result = BaseCmd._userVmService.recoverVirtualMachine(this); - UserVmResponse recoverVmResponse = ApiResponseHelper.createUserVmResponse(result); - recoverVmResponse.setResponseName(getName()); - this.setResponseObject(recoverVmResponse); + UserVm result = _userVmService.recoverVirtualMachine(this); + if (result != null){ + UserVmResponse recoverVmResponse = ApiResponseHelper.createUserVmResponse(result); + recoverVmResponse.setResponseName(getName()); + this.setResponseObject(recoverVmResponse); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to recover vm"); + } } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/RegisterCmd.java b/server/src/com/cloud/api/commands/RegisterCmd.java index 74be319df9f..a7296d0a918 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 { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - String[] keys = BaseCmd._mgr.createApiKeyAndSecretKey(this); + String[] keys = _mgr.createApiKeyAndSecretKey(this); RegisterResponse response = new RegisterResponse(); response.setApiKey(keys[0]); response.setSecretKey(keys[1]); diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java index e19e4cda087..f991f82af5f 100755 --- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -28,7 +28,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; -import com.cloud.api.BaseCmd.CommandType; import com.cloud.api.response.ListResponse; import com.cloud.api.response.TemplateResponse; import com.cloud.dc.DataCenterVO; @@ -140,52 +139,56 @@ public class RegisterIsoCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ try { - VMTemplateVO template = BaseCmd._templateMgr.registerIso(this); - ListResponse response = new ListResponse(); - List responses = new ArrayList(); - List zones = null; - - if ((zoneId != null) && (zoneId != -1)) { - zones = new ArrayList(); - zones.add(ApiDBUtils.findZoneById(zoneId)); + VMTemplateVO template = _templateMgr.registerIso(this); + if (template != null) { + ListResponse response = new ListResponse(); + List responses = new ArrayList(); + List zones = null; + + if ((zoneId != null) && (zoneId != -1)) { + zones = new ArrayList(); + zones.add(ApiDBUtils.findZoneById(zoneId)); + } else { + zones = ApiDBUtils.listZones(); + } + + for (DataCenterVO zone : zones) { + TemplateResponse templateResponse = new TemplateResponse(); + templateResponse.setId(template.getId()); + templateResponse.setName(template.getName()); + templateResponse.setDisplayText(template.getDisplayText()); + templateResponse.setPublic(template.isPublicTemplate()); + + VMTemplateHostVO isoHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), zone.getId()); + if (isoHostRef != null) { + templateResponse.setCreated(isoHostRef.getCreated()); + templateResponse.setReady(isoHostRef.getDownloadState() == Status.DOWNLOADED); + } + + templateResponse.setFeatured(template.isFeatured()); + templateResponse.setBootable(template.isBootable()); + templateResponse.setOsTypeId(template.getGuestOSId()); + templateResponse.setOsTypeName(ApiDBUtils.findGuestOSById(template.getGuestOSId()).getDisplayName()); + + Account owner = ApiDBUtils.findAccountById(template.getAccountId()); + if (owner != null) { + templateResponse.setAccountId(owner.getId()); + templateResponse.setAccount(owner.getAccountName()); + templateResponse.setDomainId(owner.getDomainId()); + } + + templateResponse.setZoneId(zone.getId()); + templateResponse.setZoneName(zone.getName()); + templateResponse.setObjectName("iso"); + + responses.add(templateResponse); + } + response.setResponseName(getName()); + response.setResponses(responses); + this.setResponseObject(response); } else { - zones = ApiDBUtils.listZones(); + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to register iso"); } - - for (DataCenterVO zone : zones) { - TemplateResponse templateResponse = new TemplateResponse(); - templateResponse.setId(template.getId()); - templateResponse.setName(template.getName()); - templateResponse.setDisplayText(template.getDisplayText()); - templateResponse.setPublic(template.isPublicTemplate()); - - VMTemplateHostVO isoHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), zone.getId()); - if (isoHostRef != null) { - templateResponse.setCreated(isoHostRef.getCreated()); - templateResponse.setReady(isoHostRef.getDownloadState() == Status.DOWNLOADED); - } - - templateResponse.setFeatured(template.isFeatured()); - templateResponse.setBootable(template.isBootable()); - templateResponse.setOsTypeId(template.getGuestOSId()); - templateResponse.setOsTypeName(ApiDBUtils.findGuestOSById(template.getGuestOSId()).getDisplayName()); - - Account owner = ApiDBUtils.findAccountById(template.getAccountId()); - if (owner != null) { - templateResponse.setAccountId(owner.getId()); - templateResponse.setAccount(owner.getAccountName()); - templateResponse.setDomainId(owner.getDomainId()); - } - - templateResponse.setZoneId(zone.getId()); - templateResponse.setZoneName(zone.getName()); - templateResponse.setObjectName("iso"); - - responses.add(templateResponse); - } - response.setResponseName(getName()); - response.setResponses(responses); - this.setResponseObject(response); } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java b/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java index 2ee8b15b803..6a328ca55ac 100644 --- a/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java +++ b/server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java @@ -101,9 +101,13 @@ public class RegisterPreallocatedLunCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - PreallocatedLunVO result = BaseCmd._mgr.registerPreallocatedLun(this); - PreallocatedLunResponse response = ApiResponseHelper.createPreallocatedLunResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + PreallocatedLunVO result = _mgr.registerPreallocatedLun(this); + if (result != null){ + PreallocatedLunResponse response = ApiResponseHelper.createPreallocatedLunResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to register preallocated lun"); + } } } diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java index a85d6209977..f5a285be22b 100755 --- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -29,7 +29,6 @@ import com.cloud.api.BaseCmd; import com.cloud.api.Implementation; import com.cloud.api.Parameter; import com.cloud.api.ServerApiException; -import com.cloud.api.BaseCmd.CommandType; import com.cloud.api.response.ListResponse; import com.cloud.api.response.TemplateResponse; import com.cloud.dc.DataCenterVO; @@ -170,64 +169,68 @@ public class RegisterTemplateCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ try { - VMTemplateVO template = BaseCmd._templateMgr.registerTemplate(this); - ListResponse response = new ListResponse(); - List responses = new ArrayList(); - List zones = null; - - if ((zoneId != null) && (zoneId != -1)) { - zones = new ArrayList(); - zones.add(ApiDBUtils.findZoneById(zoneId)); - } else { - zones = ApiDBUtils.listZones(); - } - - for (DataCenterVO zone : zones) { - TemplateResponse templateResponse = new TemplateResponse(); - templateResponse.setId(template.getId()); - templateResponse.setName(template.getName()); - templateResponse.setDisplayText(template.getDisplayText()); - templateResponse.setPublic(template.isPublicTemplate()); - templateResponse.setCrossZones(template.isCrossZones()); - - VMTemplateHostVO isoHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), zone.getId()); - if (isoHostRef != null) { - templateResponse.setCreated(isoHostRef.getCreated()); - templateResponse.setReady(isoHostRef.getDownloadState() == Status.DOWNLOADED); - } - - templateResponse.setFeatured(template.isFeatured()); - templateResponse.setPasswordEnabled(template.getEnablePassword()); - templateResponse.setFormat(template.getFormat()); - templateResponse.setStatus("Processing"); - - GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId()); - if (os != null) { - templateResponse.setOsTypeId(os.getId()); - templateResponse.setOsTypeName(os.getDisplayName()); + VMTemplateVO template = _templateMgr.registerTemplate(this); + if (template != null){ + ListResponse response = new ListResponse(); + List responses = new ArrayList(); + List zones = null; + + if ((zoneId != null) && (zoneId != -1)) { + zones = new ArrayList(); + zones.add(ApiDBUtils.findZoneById(zoneId)); } else { - templateResponse.setOsTypeId(-1L); - templateResponse.setOsTypeName(""); + zones = ApiDBUtils.listZones(); } - - Account owner = ApiDBUtils.findAccountById(template.getAccountId()); - if (owner != null) { - templateResponse.setAccountId(owner.getId()); - templateResponse.setAccount(owner.getAccountName()); - templateResponse.setDomainId(owner.getDomainId()); + + for (DataCenterVO zone : zones) { + TemplateResponse templateResponse = new TemplateResponse(); + templateResponse.setId(template.getId()); + templateResponse.setName(template.getName()); + templateResponse.setDisplayText(template.getDisplayText()); + templateResponse.setPublic(template.isPublicTemplate()); + templateResponse.setCrossZones(template.isCrossZones()); + + VMTemplateHostVO isoHostRef = ApiDBUtils.findTemplateHostRef(template.getId(), zone.getId()); + if (isoHostRef != null) { + templateResponse.setCreated(isoHostRef.getCreated()); + templateResponse.setReady(isoHostRef.getDownloadState() == Status.DOWNLOADED); + } + + templateResponse.setFeatured(template.isFeatured()); + templateResponse.setPasswordEnabled(template.getEnablePassword()); + templateResponse.setFormat(template.getFormat()); + templateResponse.setStatus("Processing"); + + GuestOS os = ApiDBUtils.findGuestOSById(template.getGuestOSId()); + if (os != null) { + templateResponse.setOsTypeId(os.getId()); + templateResponse.setOsTypeName(os.getDisplayName()); + } else { + templateResponse.setOsTypeId(-1L); + templateResponse.setOsTypeName(""); + } + + Account owner = ApiDBUtils.findAccountById(template.getAccountId()); + if (owner != null) { + templateResponse.setAccountId(owner.getId()); + templateResponse.setAccount(owner.getAccountName()); + templateResponse.setDomainId(owner.getDomainId()); + } + + templateResponse.setZoneId(zone.getId()); + templateResponse.setZoneName(zone.getName()); + templateResponse.setHypervisor(template.getHypervisorType().toString()); + templateResponse.setObjectName("template"); + + responses.add(templateResponse); } - - templateResponse.setZoneId(zone.getId()); - templateResponse.setZoneName(zone.getName()); - templateResponse.setHypervisor(template.getHypervisorType().toString()); - templateResponse.setObjectName("template"); - - responses.add(templateResponse); + response.setResponseName(getName()); + response.setResponses(responses); + + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to register template"); } - response.setResponseName(getName()); - response.setResponses(responses); - - this.setResponseObject(response); } catch (ResourceAllocationException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } catch (URISyntaxException ex1) { diff --git a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java index 3cd2ca05599..fbeea2ed0d1 100644 --- a/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/RemoveFromLoadBalancerRuleCmd.java @@ -111,7 +111,7 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkMgr.removeFromLoadBalancer(this); + boolean result = _networkMgr.removeFromLoadBalancer(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java index 12c66893b0b..4ed13389e1d 100644 --- a/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java +++ b/server/src/com/cloud/api/commands/RemoveVpnUserCmd.java @@ -116,7 +116,7 @@ public class RemoveVpnUserCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkMgr.removeVpnUser(this); + boolean result = _networkMgr.removeVpnUser(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java index a54480c365a..8bd88e22f51 100644 --- a/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java +++ b/server/src/com/cloud/api/commands/ResetVMPasswordCmd.java @@ -37,7 +37,6 @@ import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.StorageUnavailableException; import com.cloud.user.Account; import com.cloud.uservm.UserVm; -import com.cloud.utils.PasswordGenerator; @Implementation(responseObject=UserVmResponse.class, description="Resets the password for virtual machine. " + "The virtual machine must be in a \"Stopped\" state and the template must already " + @@ -105,13 +104,14 @@ public class ResetVMPasswordCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ - - password = BaseCmd._mgr.generateRandomPassword(); - UserVm result = BaseCmd._userVmService.resetVMPassword(this, password); - - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - - response.setResponseName(getName()); - this.setResponseObject(response); + password = _mgr.generateRandomPassword(); + UserVm result = _userVmService.resetVMPassword(this, password); + if (result != null){ + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to reset vm password"); + } } } diff --git a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java index aafc66b946c..f09cdb90204 100644 --- a/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java +++ b/server/src/com/cloud/api/commands/RevokeNetworkGroupIngressCmd.java @@ -186,7 +186,7 @@ public class RevokeNetworkGroupIngressCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - boolean result = BaseCmd._networkGroupMgr.revokeNetworkGroupIngress(this); + boolean result = _networkGroupMgr.revokeNetworkGroupIngress(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/StartRouter2Cmd.java b/server/src/com/cloud/api/commands/StartRouter2Cmd.java index a29da62074f..2ef5255f342 100644 --- a/server/src/com/cloud/api/commands/StartRouter2Cmd.java +++ b/server/src/com/cloud/api/commands/StartRouter2Cmd.java @@ -96,10 +96,14 @@ public class StartRouter2Cmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { - DomainRouter router = BaseCmd._routerMgr.startRouter(this); - DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router); - routerResponse.setResponseName(getName()); - this.setResponseObject(routerResponse); + DomainRouter router = _routerMgr.startRouter(this); + if (router != null){ + DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router); + routerResponse.setResponseName(getName()); + this.setResponseObject(routerResponse); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to start router"); + } } } diff --git a/server/src/com/cloud/api/commands/StartRouterCmd.java b/server/src/com/cloud/api/commands/StartRouterCmd.java index ba1074c53ae..f9cd0e0f7ac 100644 --- a/server/src/com/cloud/api/commands/StartRouterCmd.java +++ b/server/src/com/cloud/api/commands/StartRouterCmd.java @@ -96,9 +96,13 @@ public class StartRouterCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DomainRouter result = BaseCmd._routerMgr.startRouter(this); - DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(result); - routerResponse.setResponseName(getName()); - this.setResponseObject(routerResponse); + DomainRouter result = _routerMgr.startRouter(this); + if (result != null){ + DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(result); + routerResponse.setResponseName(getName()); + this.setResponseObject(routerResponse); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to start router"); + } } } diff --git a/server/src/com/cloud/api/commands/StartSystemVMCmd.java b/server/src/com/cloud/api/commands/StartSystemVMCmd.java index 382e51f550a..5142bd186d0 100644 --- a/server/src/com/cloud/api/commands/StartSystemVMCmd.java +++ b/server/src/com/cloud/api/commands/StartSystemVMCmd.java @@ -36,7 +36,6 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.user.Account; import com.cloud.user.UserContext; -import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VMInstanceVO; @Implementation(responseObject=SystemVmResponse.class, description="Starts a system virtual machine.") @@ -94,11 +93,14 @@ public class StartSystemVMCmd extends BaseAsyncCmd { } @Override - - public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, CloudRuntimeException{ + public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ VMInstanceVO instance = _mgr.startSystemVM(this); - SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance); - response.setResponseName(getName()); - this.setResponseObject(response); + if (instance != null) { + SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(instance); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Fail to start system vm"); + } } } diff --git a/server/src/com/cloud/api/commands/StartSystemVm2Cmd.java b/server/src/com/cloud/api/commands/StartSystemVm2Cmd.java index 77c642eb935..0e771ca6eb7 100644 --- a/server/src/com/cloud/api/commands/StartSystemVm2Cmd.java +++ b/server/src/com/cloud/api/commands/StartSystemVm2Cmd.java @@ -95,9 +95,13 @@ public class StartSystemVm2Cmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - VirtualMachine instance = BaseCmd._mgr.startSystemVm(this); - SystemVmResponse response = ApiResponseHelper.createSystemVmResponse((VMInstanceVO)instance); - response.setResponseName(getName()); - this.setResponseObject(response); + VirtualMachine instance = _mgr.startSystemVm(this); + if (instance != null){ + SystemVmResponse response = ApiResponseHelper.createSystemVmResponse((VMInstanceVO)instance); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to start system vm"); + } } } diff --git a/server/src/com/cloud/api/commands/StartVMCmd.java b/server/src/com/cloud/api/commands/StartVMCmd.java index 876eb4ab594..c9f32e4e6e0 100644 --- a/server/src/com/cloud/api/commands/StartVMCmd.java +++ b/server/src/com/cloud/api/commands/StartVMCmd.java @@ -96,10 +96,14 @@ public class StartVMCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ try { - UserVm result = BaseCmd._userVmService.startVirtualMachine(this); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + UserVm result = _userVmService.startVirtualMachine(this); + if (result != null){ + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to start a vm"); + } } catch (ExecutionException ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/StartVm2Cmd.java b/server/src/com/cloud/api/commands/StartVm2Cmd.java index efa0a3e799d..c3b012dce64 100644 --- a/server/src/com/cloud/api/commands/StartVm2Cmd.java +++ b/server/src/com/cloud/api/commands/StartVm2Cmd.java @@ -68,109 +68,111 @@ public class StartVm2Cmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ try { - UserVm vm = BaseCmd._userVmService.startVirtualMachine(this); - - UserVmResponse response = new UserVmResponse(); - response.setId(vm.getId()); - response.setName(vm.getHostName()); - response.setCreated(vm.getCreated()); - response.setZoneId(vm.getDataCenterId()); - response.setZoneName(ApiDBUtils.findZoneById(vm.getDataCenterId()).getName()); - response.setIpAddress(vm.getPrivateIpAddress()); - response.setServiceOfferingId(vm.getServiceOfferingId()); - response.setHaEnable(vm.isHaEnabled()); - if (vm.getDisplayName() == null || vm.getDisplayName().length() == 0) { - response.setDisplayName(vm.getHostName()); - } else { - response.setDisplayName(vm.getDisplayName()); - } - - InstanceGroupVO group = ApiDBUtils.findInstanceGroupForVM(vm.getId()); - if (group != null) { - response.setGroup(group.getName()); - response.setGroupId(group.getId()); - } - - if (vm.getState() != null) { - response.setState(vm.getState().toString()); - } - - Account acct = ApiDBUtils.findAccountById(vm.getAccountId()); - if (acct != null) { - response.setAccountName(acct.getAccountName()); - response.setDomainId(acct.getDomainId()); - response.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName()); - } - - if (BaseCmd.isAdmin(acct.getType()) && (vm.getHostId() != null)) { - response.setHostName(ApiDBUtils.findHostById(vm.getHostId()).getName()); - response.setHostId(vm.getHostId()); - } + UserVm vm = _userVmService.startVirtualMachine(this); - String templateName = "ISO Boot"; - boolean templatePasswordEnabled = false; - String templateDisplayText = "ISO Boot"; - - VMTemplateVO template = ApiDBUtils.findTemplateById(vm.getTemplateId()); - if (template != null) { - templateName = template.getName(); - templatePasswordEnabled = template.getEnablePassword(); - templateDisplayText = template.getDisplayText(); - if (templateDisplayText == null) { - templateDisplayText = templateName; - } - } - - response.setTemplateId(vm.getTemplateId()); - response.setTemplateName(templateName); - response.setTemplateDisplayText(templateDisplayText); - response.setPasswordEnabled(templatePasswordEnabled); - if (templatePasswordEnabled) { - response.setPassword(null); // FIXME: Where should password come from? In the old framework, password was always passed - // in to composeResultObject() as null, so that behavior is preserved... - } else { - response.setPassword(""); - } - - String isoName = null; - if (vm.getIsoId() != null) { - VMTemplateVO iso = ApiDBUtils.findTemplateById(vm.getIsoId().longValue()); - if (iso != null) { - isoName = iso.getName(); + if (vm != null){ + UserVmResponse response = new UserVmResponse(); + response.setId(vm.getId()); + response.setName(vm.getHostName()); + response.setCreated(vm.getCreated()); + response.setZoneId(vm.getDataCenterId()); + response.setZoneName(ApiDBUtils.findZoneById(vm.getDataCenterId()).getName()); + response.setIpAddress(vm.getPrivateIpAddress()); + response.setServiceOfferingId(vm.getServiceOfferingId()); + response.setHaEnable(vm.isHaEnabled()); + if (vm.getDisplayName() == null || vm.getDisplayName().length() == 0) { + response.setDisplayName(vm.getHostName()); + } else { + response.setDisplayName(vm.getDisplayName()); } + + InstanceGroupVO group = ApiDBUtils.findInstanceGroupForVM(vm.getId()); + if (group != null) { + response.setGroup(group.getName()); + response.setGroupId(group.getId()); + } + + if (vm.getState() != null) { + response.setState(vm.getState().toString()); + } + + Account acct = ApiDBUtils.findAccountById(vm.getAccountId()); + if (acct != null) { + response.setAccountName(acct.getAccountName()); + response.setDomainId(acct.getDomainId()); + response.setDomainName(ApiDBUtils.findDomainById(acct.getDomainId()).getName()); + } + + if (BaseCmd.isAdmin(acct.getType()) && (vm.getHostId() != null)) { + response.setHostName(ApiDBUtils.findHostById(vm.getHostId()).getName()); + response.setHostId(vm.getHostId()); + } + + String templateName = "ISO Boot"; + boolean templatePasswordEnabled = false; + String templateDisplayText = "ISO Boot"; + + VMTemplateVO template = ApiDBUtils.findTemplateById(vm.getTemplateId()); + if (template != null) { + templateName = template.getName(); + templatePasswordEnabled = template.getEnablePassword(); + templateDisplayText = template.getDisplayText(); + if (templateDisplayText == null) { + templateDisplayText = templateName; + } + } + + response.setTemplateId(vm.getTemplateId()); + response.setTemplateName(templateName); + response.setTemplateDisplayText(templateDisplayText); + response.setPasswordEnabled(templatePasswordEnabled); + if (templatePasswordEnabled) { + response.setPassword(null); // FIXME: Where should password come from? In the old framework, password was always passed + // in to composeResultObject() as null, so that behavior is preserved... + } else { + response.setPassword(""); + } + + String isoName = null; + if (vm.getIsoId() != null) { + VMTemplateVO iso = ApiDBUtils.findTemplateById(vm.getIsoId().longValue()); + if (iso != null) { + isoName = iso.getName(); + } + } + + response.setIsoId(vm.getIsoId()); + response.setIsoName(isoName); + + ServiceOffering offering = ApiDBUtils.findServiceOfferingById(vm.getServiceOfferingId()); + response.setServiceOfferingId(vm.getServiceOfferingId()); + response.setServiceOfferingName(offering.getName()); + + response.setCpuNumber(offering.getCpu()); + response.setCpuSpeed(offering.getSpeed()); + response.setMemory(offering.getRamSize()); + + VolumeVO rootVolume = ApiDBUtils.findRootVolume(vm.getId()); + if (rootVolume != null) { + response.setRootDeviceId(rootVolume.getDeviceId()); + StoragePoolVO storagePool = ApiDBUtils.findStoragePoolById(rootVolume.getPoolId()); + response.setRootDeviceType(storagePool.getPoolType().toString()); + } + + response.setGuestOsId(vm.getGuestOSId()); + + //Network groups + response.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(vm.getId())); + response.setObjectName("virtualmachine"); + response.setResponseName(getName()); + //response.setResponseName(getResultObjectName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to start a vm"); } - - response.setIsoId(vm.getIsoId()); - response.setIsoName(isoName); - - ServiceOffering offering = ApiDBUtils.findServiceOfferingById(vm.getServiceOfferingId()); - response.setServiceOfferingId(vm.getServiceOfferingId()); - response.setServiceOfferingName(offering.getName()); - - response.setCpuNumber(offering.getCpu()); - response.setCpuSpeed(offering.getSpeed()); - response.setMemory(offering.getRamSize()); - - VolumeVO rootVolume = ApiDBUtils.findRootVolume(vm.getId()); - if (rootVolume != null) { - response.setRootDeviceId(rootVolume.getDeviceId()); - StoragePoolVO storagePool = ApiDBUtils.findStoragePoolById(rootVolume.getPoolId()); - response.setRootDeviceType(storagePool.getPoolType().toString()); - } - - response.setGuestOsId(vm.getGuestOSId()); - - //Network groups - response.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(vm.getId())); - response.setObjectName("virtualmachine"); - response.setResponseName(getName()); - //response.setResponseName(getResultObjectName()); - this.setResponseObject(response); } catch (Exception ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to start a vm"); } - - } @Override diff --git a/server/src/com/cloud/api/commands/StopRouter2Cmd.java b/server/src/com/cloud/api/commands/StopRouter2Cmd.java index 0a2ee0a45c3..bc25e53afd6 100644 --- a/server/src/com/cloud/api/commands/StopRouter2Cmd.java +++ b/server/src/com/cloud/api/commands/StopRouter2Cmd.java @@ -92,9 +92,13 @@ public class StopRouter2Cmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ - DomainRouter router = BaseCmd._routerMgr.stopRouter(this); - DomainRouterResponse response =ApiResponseHelper.createDomainRouterResponse(router); - response.setResponseName(getName()); - this.setResponseObject(response); + DomainRouter router = _routerMgr.stopRouter(this); + if (router != null){ + DomainRouterResponse response =ApiResponseHelper.createDomainRouterResponse(router); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to stop router"); + } } } diff --git a/server/src/com/cloud/api/commands/StopRouterCmd.java b/server/src/com/cloud/api/commands/StopRouterCmd.java index 797efa53640..d2487203919 100644 --- a/server/src/com/cloud/api/commands/StopRouterCmd.java +++ b/server/src/com/cloud/api/commands/StopRouterCmd.java @@ -91,9 +91,13 @@ public class StopRouterCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DomainRouter result = BaseCmd._routerMgr.stopRouter(this); - DomainRouterResponse response =ApiResponseHelper.createDomainRouterResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + DomainRouter result = _routerMgr.stopRouter(this); + if (result != null){ + DomainRouterResponse response =ApiResponseHelper.createDomainRouterResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to stop router"); + } } } diff --git a/server/src/com/cloud/api/commands/StopSystemVm2Cmd.java b/server/src/com/cloud/api/commands/StopSystemVm2Cmd.java index a0cf9b6c19a..d882fc300b0 100644 --- a/server/src/com/cloud/api/commands/StopSystemVm2Cmd.java +++ b/server/src/com/cloud/api/commands/StopSystemVm2Cmd.java @@ -91,8 +91,13 @@ public class StopSystemVm2Cmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - VirtualMachine instance = BaseCmd._mgr.stopSystemVm(this); - SystemVmResponse response = ApiResponseHelper.createSystemVmResponse((VMInstanceVO)instance); - response.setResponseName(getName()); + VirtualMachine instance = _mgr.stopSystemVm(this); + if (instance != null){ + SystemVmResponse response = ApiResponseHelper.createSystemVmResponse((VMInstanceVO)instance); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to stop system vm"); + } } } diff --git a/server/src/com/cloud/api/commands/StopSystemVmCmd.java b/server/src/com/cloud/api/commands/StopSystemVmCmd.java index bd57d9c8238..54f312c6a2f 100644 --- a/server/src/com/cloud/api/commands/StopSystemVmCmd.java +++ b/server/src/com/cloud/api/commands/StopSystemVmCmd.java @@ -90,9 +90,13 @@ public class StopSystemVmCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - VMInstanceVO result = BaseCmd._mgr.stopSystemVM(this); - SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + VMInstanceVO result = _mgr.stopSystemVM(this); + if (result != null) { + SystemVmResponse response = ApiResponseHelper.createSystemVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Fail to stop system vm"); + } } } diff --git a/server/src/com/cloud/api/commands/StopVMCmd.java b/server/src/com/cloud/api/commands/StopVMCmd.java index adad80c103a..6fefcda046d 100644 --- a/server/src/com/cloud/api/commands/StopVMCmd.java +++ b/server/src/com/cloud/api/commands/StopVMCmd.java @@ -94,9 +94,13 @@ public class StopVMCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ - UserVm result = BaseCmd._userVmService.stopVirtualMachine(this); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + UserVm result = _userVmService.stopVirtualMachine(this); + if (result != null) { + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to stop vm"); + } } } diff --git a/server/src/com/cloud/api/commands/StopVm2Cmd.java b/server/src/com/cloud/api/commands/StopVm2Cmd.java index 244bbb996c3..3b924b74689 100644 --- a/server/src/com/cloud/api/commands/StopVm2Cmd.java +++ b/server/src/com/cloud/api/commands/StopVm2Cmd.java @@ -63,7 +63,7 @@ public class StopVm2Cmd extends BaseAsyncCmd { ///////////////////////////////////////////////////// @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - UserVm userVm = BaseCmd._userVmService.stopVirtualMachine(this); + UserVm userVm = _userVmService.stopVirtualMachine(this); UserVmResponse response = ApiResponseHelper.createUserVmResponse(userVm); response.setResponseName(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/UpdateAccountCmd.java b/server/src/com/cloud/api/commands/UpdateAccountCmd.java index 256471b9706..42043ec469e 100644 --- a/server/src/com/cloud/api/commands/UpdateAccountCmd.java +++ b/server/src/com/cloud/api/commands/UpdateAccountCmd.java @@ -78,9 +78,13 @@ public class UpdateAccountCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Account result = BaseCmd._accountService.updateAccount(this); - AccountResponse response = ApiResponseHelper.createAccountResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + Account result = _accountService.updateAccount(this); + if (result != null){ + AccountResponse response = ApiResponseHelper.createAccountResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update account"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateCfgCmd.java b/server/src/com/cloud/api/commands/UpdateCfgCmd.java index cb19ee91e03..6d2aaef3aba 100644 --- a/server/src/com/cloud/api/commands/UpdateCfgCmd.java +++ b/server/src/com/cloud/api/commands/UpdateCfgCmd.java @@ -72,7 +72,7 @@ public class UpdateCfgCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Configuration cfg = BaseCmd._configService.updateConfiguration(this); + Configuration cfg = _configService.updateConfiguration(this); if (cfg != null) { ConfigurationResponse response = ApiResponseHelper.createConfigurationResponse((ConfigurationVO)cfg); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java index 5abbee1482f..1fe2db90116 100644 --- a/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java +++ b/server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java @@ -86,9 +86,13 @@ public class UpdateDiskOfferingCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DiskOffering result = BaseCmd._configService.updateDiskOffering(this); - DiskOfferingResponse response = ApiResponseHelper.createDiskOfferingResponse((DiskOfferingVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + DiskOffering result = _configService.updateDiskOffering(this); + if (result != null){ + DiskOfferingResponse response = ApiResponseHelper.createDiskOfferingResponse((DiskOfferingVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update disk offering"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateDomainCmd.java b/server/src/com/cloud/api/commands/UpdateDomainCmd.java index 7d9aae4072e..6590aa7c9a3 100644 --- a/server/src/com/cloud/api/commands/UpdateDomainCmd.java +++ b/server/src/com/cloud/api/commands/UpdateDomainCmd.java @@ -71,7 +71,7 @@ public class UpdateDomainCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DomainVO domain = BaseCmd._mgr.updateDomain(this); + DomainVO domain = _mgr.updateDomain(this); if (domain != null) { DomainResponse response = ApiResponseHelper.createDomainResponse(domain); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/UpdateHostCmd.java b/server/src/com/cloud/api/commands/UpdateHostCmd.java index 34c3d0554db..6a58bff2502 100644 --- a/server/src/com/cloud/api/commands/UpdateHostCmd.java +++ b/server/src/com/cloud/api/commands/UpdateHostCmd.java @@ -76,7 +76,7 @@ public class UpdateHostCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - HostVO result = BaseCmd._agentMgr.updateHost(this); + HostVO result = _agentMgr.updateHost(this); if (result != null) { HostResponse hostResponse = ApiResponseHelper.createHostResponse(result); hostResponse.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/UpdateIsoCmd.java b/server/src/com/cloud/api/commands/UpdateIsoCmd.java index 5489ee1585a..7711c952c22 100755 --- a/server/src/com/cloud/api/commands/UpdateIsoCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIsoCmd.java @@ -60,7 +60,7 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ - VMTemplateVO result = BaseCmd._mgr.updateTemplate(this); + VMTemplateVO result = _mgr.updateTemplate(this); TemplateResponse response = new TemplateResponse(); if (result != null) { response.setId(result.getId()); diff --git a/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java index 0120b5fe974..18b68fa3817 100644 --- a/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateIsoPermissionsCmd.java @@ -25,7 +25,7 @@ public class UpdateIsoPermissionsCmd extends UpdateTemplateOrIsoPermissionsCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ - boolean result = BaseCmd._mgr.updateTemplatePermissions(this); + boolean result = _mgr.updateTemplatePermissions(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java index 82139541dfc..7967d43dce4 100644 --- a/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdateLoadBalancerRuleCmd.java @@ -115,9 +115,13 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - LoadBalancerVO result = BaseCmd._networkMgr.updateLoadBalancerRule(this); - LoadBalancerResponse response = ApiResponseHelper.createLoadBalancerResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + LoadBalancerVO result = _networkMgr.updateLoadBalancerRule(this); + if (result != null){ + LoadBalancerResponse response = ApiResponseHelper.createLoadBalancerResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update load balancer rule"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdatePodCmd.java b/server/src/com/cloud/api/commands/UpdatePodCmd.java index c0fbf3e0149..416e8d58e14 100644 --- a/server/src/com/cloud/api/commands/UpdatePodCmd.java +++ b/server/src/com/cloud/api/commands/UpdatePodCmd.java @@ -101,9 +101,13 @@ public class UpdatePodCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - Pod result = BaseCmd._configService.editPod(this); - PodResponse response = ApiResponseHelper.createPodResponse((HostPodVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + Pod result = _configService.editPod(this); + if (result != null) { + PodResponse response = ApiResponseHelper.createPodResponse((HostPodVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update pod"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java b/server/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java index 45076656052..8e4019aef61 100644 --- a/server/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java +++ b/server/src/com/cloud/api/commands/UpdatePortForwardingRuleCmd.java @@ -108,9 +108,13 @@ public class UpdatePortForwardingRuleCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - FirewallRuleVO result = BaseCmd._mgr.updatePortForwardingRule(this); - FirewallRuleResponse response = ApiResponseHelper.createFirewallRuleResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + FirewallRuleVO result = _mgr.updatePortForwardingRule(this); + if (result != null) { + FirewallRuleResponse response = ApiResponseHelper.createFirewallRuleResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update port forwarding rule"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java index 0bf9d4133c0..d45e5cd9ae5 100644 --- a/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java +++ b/server/src/com/cloud/api/commands/UpdateResourceLimitCmd.java @@ -92,9 +92,13 @@ public class UpdateResourceLimitCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - ResourceLimit result = BaseCmd._accountService.updateResourceLimit(this); - ResourceLimitResponse response = ApiResponseHelper.createResourceLimitResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + ResourceLimit result = _accountService.updateResourceLimit(this); + if (result != null){ + ResourceLimitResponse response = ApiResponseHelper.createResourceLimitResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update resource limit"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java index eeeb222f3be..328d7e040ce 100644 --- a/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java +++ b/server/src/com/cloud/api/commands/UpdateServiceOfferingCmd.java @@ -100,9 +100,13 @@ public class UpdateServiceOfferingCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - ServiceOffering result = BaseCmd._configService.updateServiceOffering(this); - ServiceOfferingResponse response = ApiResponseHelper.createServiceOfferingResponse((ServiceOfferingVO)result); - response.setResponseName(getName()); - this.setResponseObject(response); + ServiceOffering result = _configService.updateServiceOffering(this); + if (result != null){ + ServiceOfferingResponse response = ApiResponseHelper.createServiceOfferingResponse((ServiceOfferingVO)result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update service offering"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java b/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java index f1f131e2e13..8f87d660ab1 100644 --- a/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java +++ b/server/src/com/cloud/api/commands/UpdateStoragePoolCmd.java @@ -73,9 +73,13 @@ public class UpdateStoragePoolCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - StoragePoolVO result = BaseCmd._storageMgr.updateStoragePool(this); - StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + StoragePoolVO result = _storageMgr.updateStoragePool(this); + if (result != null){ + StoragePoolResponse response = ApiResponseHelper.createStoragePoolResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update storage pool"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java index 989e21145b9..a5a065176da 100755 --- a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java @@ -61,7 +61,7 @@ public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ - VMTemplateVO result = BaseCmd._mgr.updateTemplate(this); + VMTemplateVO result = _mgr.updateTemplate(this); TemplateResponse response = new TemplateResponse(); if (result != null) { response.setId(result.getId()); @@ -76,7 +76,6 @@ public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd { response.setCrossZones(result.isCrossZones()); response.setObjectName("template"); response.setResponseName(getName()); - this.setResponseObject(response); } 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 f6165eac1ff..1299d2976af 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplateOrIsoPermissionsCmd.java @@ -6,10 +6,8 @@ import org.apache.log4j.Logger; 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.TemplateResponse; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; diff --git a/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java b/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java index d213dc7d736..ff40b2e9d23 100644 --- a/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java +++ b/server/src/com/cloud/api/commands/UpdateTemplatePermissionsCmd.java @@ -47,7 +47,7 @@ public class UpdateTemplatePermissionsCmd extends UpdateTemplateOrIsoPermissions @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException{ - boolean result = BaseCmd._mgr.updateTemplatePermissions(this); + boolean result = _mgr.updateTemplatePermissions(this); if (result) { SuccessResponse response = new SuccessResponse(getName()); this.setResponseObject(response); diff --git a/server/src/com/cloud/api/commands/UpdateUserCmd.java b/server/src/com/cloud/api/commands/UpdateUserCmd.java index f8a9ec24a9e..2cff3402ea9 100644 --- a/server/src/com/cloud/api/commands/UpdateUserCmd.java +++ b/server/src/com/cloud/api/commands/UpdateUserCmd.java @@ -121,9 +121,13 @@ public class UpdateUserCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - UserAccount user = BaseCmd._accountService.updateUser(this); - UserResponse response = ApiResponseHelper.createUserResponse(user); - response.setResponseName(getName()); - this.setResponseObject(response); + UserAccount user = _accountService.updateUser(this); + if (user != null){ + UserResponse response = ApiResponseHelper.createUserResponse(user); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update user"); + } } } \ No newline at end of file diff --git a/server/src/com/cloud/api/commands/UpdateVMCmd.java b/server/src/com/cloud/api/commands/UpdateVMCmd.java index a123f387f7e..0b0ffc39f0c 100644 --- a/server/src/com/cloud/api/commands/UpdateVMCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMCmd.java @@ -90,9 +90,13 @@ public class UpdateVMCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ - UserVm result = BaseCmd._userVmService.updateVirtualMachine(this); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + UserVm result = _userVmService.updateVirtualMachine(this); + if (result != null){ + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update vm"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java b/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java index 20c2f1b973f..5658490b19e 100644 --- a/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java @@ -72,9 +72,13 @@ public class UpdateVMGroupCmd extends BaseCmd{ @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - InstanceGroupVO result = BaseCmd._mgr.updateVmGroup(this); - InstanceGroupResponse response = ApiResponseHelper.createInstanceGroupResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + InstanceGroupVO result = _mgr.updateVmGroup(this); + if (result != null){ + InstanceGroupResponse response = ApiResponseHelper.createInstanceGroupResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update vm instance group"); + } } } diff --git a/server/src/com/cloud/api/commands/UpdateZoneCmd.java b/server/src/com/cloud/api/commands/UpdateZoneCmd.java index 38cc5f7b46b..bf65cb08756 100644 --- a/server/src/com/cloud/api/commands/UpdateZoneCmd.java +++ b/server/src/com/cloud/api/commands/UpdateZoneCmd.java @@ -134,7 +134,7 @@ public class UpdateZoneCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DataCenter result = BaseCmd._configService.editZone(this); + DataCenter result = _configService.editZone(this); if (result != null) { ZoneResponse response = ApiResponseHelper.createZoneResponse((DataCenterVO)result); response.setResponseName(getName()); diff --git a/server/src/com/cloud/api/commands/UpgradeRouterCmd.java b/server/src/com/cloud/api/commands/UpgradeRouterCmd.java index 0c8eb9bf94b..dfea4e61af7 100644 --- a/server/src/com/cloud/api/commands/UpgradeRouterCmd.java +++ b/server/src/com/cloud/api/commands/UpgradeRouterCmd.java @@ -71,9 +71,13 @@ public class UpgradeRouterCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - DomainRouter router = BaseCmd._networkMgr.upgradeRouter(this); - DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router); - routerResponse.setResponseName(getName()); - this.setResponseObject(routerResponse); + DomainRouter router = _networkMgr.upgradeRouter(this); + if (router != null){ + DomainRouterResponse routerResponse = ApiResponseHelper.createDomainRouterResponse(router); + routerResponse.setResponseName(getName()); + this.setResponseObject(routerResponse); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to upgrade router"); + } } } diff --git a/server/src/com/cloud/api/commands/UpgradeVMCmd.java b/server/src/com/cloud/api/commands/UpgradeVMCmd.java index b13abde7a22..6c2cf62a6ec 100644 --- a/server/src/com/cloud/api/commands/UpgradeVMCmd.java +++ b/server/src/com/cloud/api/commands/UpgradeVMCmd.java @@ -78,9 +78,13 @@ public class UpgradeVMCmd extends BaseCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException, StorageUnavailableException{ - UserVm result = BaseCmd._userVmService.upgradeVirtualMachine(this); - UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); - response.setResponseName(getName()); - this.setResponseObject(response); + UserVm result = _userVmService.upgradeVirtualMachine(this); + if (result != null){ + UserVmResponse response = ApiResponseHelper.createUserVmResponse(result); + response.setResponseName(getName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to upgrade vm"); + } } } diff --git a/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java index 47d9193264e..15c03375416 100644 --- a/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java @@ -73,12 +73,16 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd { @Override public void execute() throws ServerApiException, InvalidParameterValueException, PermissionDeniedException, InsufficientAddressCapacityException, InsufficientCapacityException, ConcurrentOperationException{ - String result = BaseCmd._mgr.uploadCertificate(this); - CustomCertificateResponse response = new CustomCertificateResponse(); - response.setResponseName(getName()); - response.setUpdatedConsoleProxyIdList(result); - response.setObjectName("customcertificate"); - this.setResponseObject(response); + String result = _mgr.uploadCertificate(this); + if (result != null){ + CustomCertificateResponse response = new CustomCertificateResponse(); + response.setResponseName(getName()); + response.setUpdatedConsoleProxyIdList(result); + response.setObjectName("customcertificate"); + this.setResponseObject(response); + } else { + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to upload custom certificate"); + } } } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 13e731a23aa..0f2119fa6aa 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -61,8 +61,6 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; -import com.cloud.acl.DomainChecker; -import com.cloud.acl.SecurityChecker; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.GetVncPortAnswer; @@ -126,9 +124,9 @@ import com.cloud.api.commands.StartSystemVm2Cmd; import com.cloud.api.commands.StopSystemVm2Cmd; import com.cloud.api.commands.StopSystemVmCmd; import com.cloud.api.commands.UpdateDomainCmd; -import com.cloud.api.commands.UpdatePortForwardingRuleCmd; import com.cloud.api.commands.UpdateIsoCmd; import com.cloud.api.commands.UpdateIsoPermissionsCmd; +import com.cloud.api.commands.UpdatePortForwardingRuleCmd; import com.cloud.api.commands.UpdateTemplateCmd; import com.cloud.api.commands.UpdateTemplateOrIsoCmd; import com.cloud.api.commands.UpdateTemplateOrIsoPermissionsCmd; @@ -155,7 +153,6 @@ import com.cloud.configuration.dao.ResourceLimitDao; import com.cloud.consoleproxy.ConsoleProxyManager; import com.cloud.dc.AccountVlanMapVO; import com.cloud.dc.ClusterVO; -import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenterIpAddressVO; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; @@ -169,7 +166,6 @@ import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.PodVlanMapDao; import com.cloud.dc.dao.VlanDao; -import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.EventState; @@ -279,7 +275,6 @@ import com.cloud.utils.Pair; import com.cloud.utils.PasswordGenerator; import com.cloud.utils.component.Adapters; import com.cloud.utils.component.ComponentLocator; -import com.cloud.utils.component.Inject; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter;