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

Fixed create/list LoadBalancerRules

This commit is contained in:
alena 2010-12-09 18:58:18 -08:00
parent 04f3a4baa9
commit 7e9579dab2
171 changed files with 516 additions and 546 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/com/cloud/api/BaseAsyncCmd.java
View File

@ -58,7 +58,7 @@ public abstract class BaseAsyncCmd extends BaseCmd {
public ResponseObject getResponse(long jobId) {
AsyncJobResponse response = new AsyncJobResponse();
response.setId(jobId);
response.setResponseName(getName());
response.setResponseName(getCommandName());
return response;
}

2
api/src/com/cloud/api/BaseAsyncCreateCmd.java
View File

@ -20,7 +20,7 @@ public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {
CreateCmdResponse response = new CreateCmdResponse();
response.setJobId(jobId);
response.setId(objectId);
response.setResponseName(getName());
response.setResponseName(getCommandName());
return _responseGenerator.toSerializedString(response, getResponseType());
}
}

14
api/src/com/cloud/api/BaseCmd.java
View File

@ -139,7 +139,7 @@ public abstract class BaseCmd {
this.responseType = responseType;
}
public abstract String getName();
public abstract String getCommandName();
public Object getResponseObject() {
return _responseObject;
@ -342,14 +342,14 @@ public abstract class BaseCmd {
StringBuffer sb = new StringBuffer();
if (RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
// JSON response
sb.append("{ \"" + getName() + "\" : { " + "\"@attributes\":{\"cloud-stack-version\":\""+_mgr.getVersion()+"\"},");
sb.append("{ \"" + getCommandName() + "\" : { " + "\"@attributes\":{\"cloud-stack-version\":\""+_mgr.getVersion()+"\"},");
sb.append("\"errorcode\" : \"" + apiException.getErrorCode() + "\", \"description\" : \"" + apiException.getDescription() + "\" } }");
} else {
sb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>");
sb.append("<" + getName() + ">");
sb.append("<" + getCommandName() + ">");
sb.append("<errorcode>" + apiException.getErrorCode() + "</errorcode>");
sb.append("<description>" + escapeXml(apiException.getDescription()) + "</description>");
sb.append("</" + getName() + " cloud-stack-version=\""+_mgr.getVersion()+ "\">");
sb.append("</" + getCommandName() + " cloud-stack-version=\""+_mgr.getVersion()+ "\">");
}
return sb.toString();
}
@ -360,10 +360,10 @@ public abstract class BaseCmd {
// set up the return value with the name of the response
if (RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
prefixSb.append("{ \"" + getName() + "\" : { \"@attributes\":{\"cloud-stack-version\":\""+ _mgr.getVersion()+"\"},");
prefixSb.append("{ \"" + getCommandName() + "\" : { \"@attributes\":{\"cloud-stack-version\":\""+ _mgr.getVersion()+"\"},");
} else {
prefixSb.append("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>");
prefixSb.append("<" + getName() + " cloud-stack-version=\""+_mgr.getVersion()+ "\">");
prefixSb.append("<" + getCommandName() + " cloud-stack-version=\""+_mgr.getVersion()+ "\">");
}
int i = 0;
@ -391,7 +391,7 @@ public abstract class BaseCmd {
if (RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) {
prefixSb.append("} }");
} else {
prefixSb.append("</" + getName() + ">");
prefixSb.append("</" + getCommandName() + ">");
}
return prefixSb.toString();
}

4
api/src/com/cloud/api/commands/AddHostCmd.java
View File

@ -101,7 +101,7 @@ public class AddHostCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -121,7 +121,7 @@ public class AddHostCmd extends BaseCmd {
}
response.setResponses(hostResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} catch (DiscoveryException ex) {

4
api/src/com/cloud/api/commands/AddSecondaryStorageCmd.java
View File

@ -63,7 +63,7 @@ public class AddSecondaryStorageCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -76,7 +76,7 @@ public class AddSecondaryStorageCmd extends BaseCmd {
for (Host host : result) {
// There should only be one secondary storage host per add
hostResponse = _responseGenerator.createHostResponse(host);
hostResponse.setResponseName(getName());
hostResponse.setResponseName(getCommandName());
hostResponse.setObjectName("secondarystorage");
this.setResponseObject(hostResponse);
}

4
api/src/com/cloud/api/commands/AddVpnUserCmd.java
View File

@ -88,7 +88,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -139,7 +139,7 @@ public class AddVpnUserCmd extends BaseAsyncCmd {
vpnResponse.setDomainName(_entityMgr.findById(Domain.class, accountTemp.getDomainId()).getName());
}
vpnResponse.setResponseName(getName());
vpnResponse.setResponseName(getCommandName());
vpnResponse.setObjectName("vpnuser");
this.setResponseObject(vpnResponse);
} else {

4
api/src/com/cloud/api/commands/AssignToLoadBalancerRuleCmd.java
View File

@ -74,7 +74,7 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -111,7 +111,7 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
}
boolean result = _lbService.assignToLoadBalancer(getLoadBalancerId(), virtualMachineIds);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to assign load balancer rule");

4
api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
View File

@ -100,7 +100,7 @@ public class AssociateIPAddrCmd extends BaseCmd {
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -114,7 +114,7 @@ public class AssociateIPAddrCmd extends BaseCmd {
IpAddress result = _networkService.associateIP(this);
if (result != null) {
IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(result);
ipResponse.setResponseName(getName());
ipResponse.setResponseName(getCommandName());
this.setResponseObject(ipResponse);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to assign ip address");

2
api/src/com/cloud/api/commands/AttachIsoCmd.java
View File

@ -66,7 +66,7 @@ public class AttachIsoCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}

4
api/src/com/cloud/api/commands/AttachVolumeCmd.java
View File

@ -83,7 +83,7 @@ public class AttachVolumeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -124,7 +124,7 @@ public class AttachVolumeCmd extends BaseAsyncCmd {
Volume result = _userVmService.attachVolumeToVM(this);
if (result != null) {
VolumeResponse response = _responseGenerator.createVolumeResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to attach volume");

2
api/src/com/cloud/api/commands/AuthorizeNetworkGroupIngressCmd.java
View File

@ -144,7 +144,7 @@ public class AuthorizeNetworkGroupIngressCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}

4
api/src/com/cloud/api/commands/CancelMaintenanceCmd.java
View File

@ -61,7 +61,7 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -102,7 +102,7 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd {
Host result = _resourceService.cancelMaintenance(this);
if (result != null) {
HostResponse response = _responseGenerator.createHostResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to cancel host maintenance");

4
api/src/com/cloud/api/commands/CancelPrimaryStorageMaintenanceCmd.java
View File

@ -61,7 +61,7 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -102,7 +102,7 @@ public class CancelPrimaryStorageMaintenanceCmd extends BaseAsyncCmd {
StoragePool result = _storageMgr.cancelPrimaryStorageForMaintenance(this);
if (result != null) {
StoragePoolResponse response = _responseGenerator.createStoragePoolResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to cancel primary storage maintenance");

4
api/src/com/cloud/api/commands/CopyIsoCmd.java
View File

@ -72,7 +72,7 @@ public class CopyIsoCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -114,7 +114,7 @@ public class CopyIsoCmd extends BaseAsyncCmd {
try {
VirtualMachineTemplate iso = _templateService.copyIso(this);
TemplateResponse isoResponse = _responseGenerator.createIsoResponse3(iso, destZoneId);
isoResponse.setResponseName(getName());
isoResponse.setResponseName(getCommandName());
this.setResponseObject(isoResponse);
} catch (StorageUnavailableException ex) {
s_logger.warn("Exception: ", ex);

4
api/src/com/cloud/api/commands/CopyTemplateCmd.java
View File

@ -73,7 +73,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -115,7 +115,7 @@ public class CopyTemplateCmd extends BaseAsyncCmd {
try {
VirtualMachineTemplate template = _templateService.copyTemplate(this);
TemplateResponse templateResponse = _responseGenerator.createTemplateResponse(template, destZoneId);
templateResponse.setResponseName(getName());
templateResponse.setResponseName(getCommandName());
this.setResponseObject(templateResponse);
} catch (StorageUnavailableException ex) {

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

@ -89,7 +89,7 @@ public class CreateCfgCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -98,7 +98,7 @@ public class CreateCfgCmd extends BaseCmd {
Configuration cfg = _configService.addConfig(this);
if (cfg != null) {
ConfigurationResponse response = _responseGenerator.createConfigurationResponse(cfg);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config");

4
api/src/com/cloud/api/commands/CreateDiskOfferingCmd.java
View File

@ -88,7 +88,7 @@ public class CreateDiskOfferingCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -97,7 +97,7 @@ public class CreateDiskOfferingCmd extends BaseCmd {
DiskOffering offering = _configService.createDiskOffering(this);
if (offering != null) {
DiskOfferingResponse response = _responseGenerator.createDiskOfferingResponse(offering);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create disk offering");

4
api/src/com/cloud/api/commands/CreateDomainCmd.java
View File

@ -62,7 +62,7 @@ public class CreateDomainCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -71,7 +71,7 @@ public class CreateDomainCmd extends BaseCmd {
Domain domain = _mgr.createDomain(this);
if (domain != null) {
DomainResponse response = _responseGenerator.createDomainResponse(domain);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create domain");

4
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
View File

@ -69,7 +69,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Por
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -86,7 +86,7 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Por
if (result) {
PortForwardingRule rule = _entityMgr.findById(PortForwardingRule.class, getEntityId());
FirewallRuleResponse fwResponse = _responseGenerator.createFirewallRuleResponse(rule);
fwResponse.setResponseName(getName());
fwResponse.setResponseName(getCommandName());
this.setResponseObject(fwResponse);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Error in creating ip forwarding rule on the domr");

40
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
View File

@ -23,20 +23,19 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.ApiConstants;
import com.cloud.api.BaseAsyncCreateCmd;
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.LoadBalancerResponse;
import com.cloud.event.EventTypes;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.network.rules.LoadBalancer;
import com.cloud.user.UserContext;
import com.cloud.utils.net.Ip;
import com.cloud.utils.net.NetUtils;
@Implementation(description="Creates a load balancer rule", responseObject=LoadBalancerResponse.class)
public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements LoadBalancer {
public class CreateLoadBalancerRuleCmd extends BaseCmd implements LoadBalancer {
public static final Logger s_logger = Logger.getLogger(CreateLoadBalancerRuleCmd.class.getName());
private static final String s_name = "createloadbalancerruleresponse";
@ -93,14 +92,17 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements Lo
public String getPublicPort() {
return publicPort;
}
public String getName() {
return loadBalancerRuleName;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -114,7 +116,7 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements Lo
throw new ServerApiException(BaseCmd.NETWORK_RULE_CONFLICT_ERROR, e.getMessage());
}
LoadBalancerResponse response = _responseGenerator.createLoadBalancerResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
@ -166,12 +168,12 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements Lo
@Override
public long getAccountId() {
throw new UnsupportedOperationException("not supported");
return UserContext.current().getAccount().getId();
}
@Override
public long getDomainId() {
throw new UnsupportedOperationException("not supported");
return UserContext.current().getAccount().getDomainId();
}
@Override
@ -188,25 +190,5 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd implements Lo
public List<? extends Destination> getDestinations() {
throw new UnsupportedOperationException("not supported");
}
@Override
public void create() {
// TODO Auto-generated method stub
}
@Override
public long getEntityOwnerId() {
return _entityMgr.findById(LoadBalancer.class, getEntityId()).getAccountId();
}
@Override
public String getEventType() {
return EventTypes.EVENT_LOAD_BALANCER_CREATE;
}
@Override
public String getEventDescription() {
return "Create load balancer";
}
}

4
api/src/com/cloud/api/commands/CreateNetworkCmd.java
View File

@ -130,7 +130,7 @@ public class CreateNetworkCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -139,7 +139,7 @@ public class CreateNetworkCmd extends BaseCmd {
Network result = _networkService.createNetwork(this);
if (result != null) {
NetworkResponse response = _responseGenerator.createNetworkResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create network");

4
api/src/com/cloud/api/commands/CreateNetworkGroupCmd.java
View File

@ -77,7 +77,7 @@ public class CreateNetworkGroupCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -86,7 +86,7 @@ public class CreateNetworkGroupCmd extends BaseCmd {
NetworkGroup group = _networkGroupMgr.createNetworkGroup(this);
if (group != null) {
NetworkGroupResponse response = _responseGenerator.createNetworkGroupResponse(group);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create network group");

4
api/src/com/cloud/api/commands/CreateNetworkOfferingCmd.java
View File

@ -94,7 +94,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return _name;
}
@ -103,7 +103,7 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
NetworkOffering result = _configService.createNetworkOffering(this);
if (result != null) {
NetworkOfferingResponse response = _responseGenerator.createNetworkOfferingResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create network offering");

4
api/src/com/cloud/api/commands/CreatePodCmd.java
View File

@ -91,7 +91,7 @@ public class CreatePodCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -100,7 +100,7 @@ public class CreatePodCmd extends BaseCmd {
Pod result = _configService.createPod(this);
if (result != null) {
PodResponse response = _responseGenerator.createPodResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create pod");

4
api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
View File

@ -91,7 +91,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -109,7 +109,7 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements
}
}
FirewallRuleResponse fwResponse = _responseGenerator.createFirewallRuleResponse(rule);
fwResponse.setResponseName(getName());
fwResponse.setResponseName(getCommandName());
setResponseObject(fwResponse);
}

4
api/src/com/cloud/api/commands/CreateRemoteAccessVpnCmd.java
View File

@ -100,7 +100,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -160,7 +160,7 @@ public class CreateRemoteAccessVpnCmd extends BaseAsyncCreateCmd {
response.setDomainId(result.getDomainId());
response.setDomainName(_entityMgr.findById(Domain.class, result.getDomainId()).getName());
response.setObjectName("remoteaccessvpn");
response.setResponseName(getName());
response.setResponseName(getCommandName());
response.setPresharedKey(result.getIpsecPresharedKey());
this.setResponseObject(response);
} else {

4
api/src/com/cloud/api/commands/CreateServiceOfferingCmd.java
View File

@ -117,7 +117,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return _name;
}
@ -126,7 +126,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
ServiceOffering result = _configService.createServiceOffering(this);
if (result != null) {
ServiceOfferingResponse response = _responseGenerator.createServiceOfferingResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create service offering");

4
api/src/com/cloud/api/commands/CreateSnapshotCmd.java
View File

@ -84,7 +84,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -130,7 +130,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
Snapshot snapshot = _snapshotMgr.createSnapshot(this);
if (snapshot != null) {
SnapshotResponse response = _responseGenerator.createSnapshotResponse(snapshot);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create snapshot due to an internal error creating snapshot for volume " + volumeId);

4
api/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java
View File

@ -103,7 +103,7 @@ public class CreateSnapshotPolicyCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -112,7 +112,7 @@ public class CreateSnapshotPolicyCmd extends BaseCmd {
SnapshotPolicy result = _snapshotMgr.createPolicy(this);
if (result != null) {
SnapshotPolicyResponse response = _responseGenerator.createSnapshotPolicyResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create snapshot policy");

4
api/src/com/cloud/api/commands/CreateStoragePoolCmd.java
View File

@ -102,7 +102,7 @@ public class CreateStoragePoolCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -112,7 +112,7 @@ public class CreateStoragePoolCmd extends BaseCmd {
StoragePool result = _storageMgr.createPool(this);
if (result != null) {
StoragePoolResponse response = _responseGenerator.createStoragePoolResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add storage pool");

4
api/src/com/cloud/api/commands/CreateTemplateCmd.java
View File

@ -125,7 +125,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -182,7 +182,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
VirtualMachineTemplate template = _userVmService.createPrivateTemplate(this);
if (template != null) {
TemplateResponse response = _responseGenerator.createTemplateResponse(template, snapshotId, volumeId);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {

4
api/src/com/cloud/api/commands/CreateUserCmd.java
View File

@ -117,7 +117,7 @@ public class CreateUserCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -126,7 +126,7 @@ public class CreateUserCmd extends BaseCmd {
UserAccount user = _accountService.createUser(this);
if (user != null) {
UserResponse response = _responseGenerator.createUserResponse(user);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a user");

4
api/src/com/cloud/api/commands/CreateVMGroupCmd.java
View File

@ -67,7 +67,7 @@ public class CreateVMGroupCmd extends BaseCmd{
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -76,7 +76,7 @@ public class CreateVMGroupCmd extends BaseCmd{
InstanceGroup result = _userVmService.createVmGroup(this);
if (result != null) {
InstanceGroupResponse response = _responseGenerator.createInstanceGroupResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create vm instance group");

4
api/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java
View File

@ -127,7 +127,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
}
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -137,7 +137,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
Vlan result = _configService.createVlanAndPublicIpRange(this);
if (result != null) {
VlanIpRangeResponse response = _responseGenerator.createVlanIpRangeResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create vlan ip range");

4
api/src/com/cloud/api/commands/CreateVolumeCmd.java
View File

@ -102,7 +102,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -165,7 +165,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
VolumeResponse response = _responseGenerator.createVolumeResponse(volume);
//FIXME - have to be moved to ApiResponseHelper
response.setSnapshotId(getSnapshotId()); // if the volume was created from a snapshot, snapshotId will be set so we pass it back in the response
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a volume");

4
api/src/com/cloud/api/commands/CreateZoneCmd.java
View File

@ -116,7 +116,7 @@ public class CreateZoneCmd extends BaseCmd {
/////////////// API Implementation///////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -125,7 +125,7 @@ public class CreateZoneCmd extends BaseCmd {
DataCenter result = _configService.createZone(this);
if (result != null){
ZoneResponse response = _responseGenerator.createZoneResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create a zone");

4
api/src/com/cloud/api/commands/DeleteDiskOfferingCmd.java
View File

@ -52,7 +52,7 @@ public class DeleteDiskOfferingCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
public String getName() {
public String getCommandName() {
return s_name;
}
@ -60,7 +60,7 @@ public class DeleteDiskOfferingCmd extends BaseCmd {
public void execute(){
boolean result = _configService.deleteDiskOffering(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete disk offering");

4
api/src/com/cloud/api/commands/DeleteDomainCmd.java
View File

@ -63,7 +63,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -91,7 +91,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _mgr.deleteDomain(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete domain");

4
api/src/com/cloud/api/commands/DeleteHostCmd.java
View File

@ -56,7 +56,7 @@ public class DeleteHostCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -64,7 +64,7 @@ public class DeleteHostCmd extends BaseCmd {
public void execute(){
boolean result = _resourceService.deleteHost(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host");

4
api/src/com/cloud/api/commands/DeleteIpForwardingRuleCmd.java
View File

@ -57,7 +57,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -65,7 +65,7 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
public void execute(){
PortForwardingRule rule = _rulesService.revokePortForwardingRule(id, true);
if (rule != null) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete ip forwarding rule");

4
api/src/com/cloud/api/commands/DeleteIsoCmd.java
View File

@ -64,7 +64,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -104,7 +104,7 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _templateService.deleteIso(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete iso");

4
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
View File

@ -55,7 +55,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -83,7 +83,7 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _lbService.deleteLoadBalancerRule(id, true);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete load balancer");

4
api/src/com/cloud/api/commands/DeleteNetworkCmd.java
View File

@ -54,7 +54,7 @@ public class DeleteNetworkCmd extends BaseCmd{
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -62,7 +62,7 @@ public class DeleteNetworkCmd extends BaseCmd{
public void execute(){
boolean result = _networkService.deleteNetwork(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete network");

4
api/src/com/cloud/api/commands/DeleteNetworkGroupCmd.java
View File

@ -51,7 +51,7 @@ public class DeleteNetworkGroupCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -60,7 +60,7 @@ public class DeleteNetworkGroupCmd extends BaseCmd {
try{
boolean result = _networkGroupMgr.deleteNetworkGroup(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete network group");

4
api/src/com/cloud/api/commands/DeleteNetworkOfferingCmd.java
View File

@ -54,7 +54,7 @@ public class DeleteNetworkOfferingCmd extends BaseCmd{
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -62,7 +62,7 @@ public class DeleteNetworkOfferingCmd extends BaseCmd{
public void execute(){
boolean result = _configService.deleteNetworkOffering(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete service offering");

4
api/src/com/cloud/api/commands/DeletePodCmd.java
View File

@ -53,7 +53,7 @@ public class DeletePodCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
public String getName() {
public String getCommandName() {
return s_name;
}
@ -61,7 +61,7 @@ public class DeletePodCmd extends BaseCmd {
public void execute(){
boolean result = _configService.deletePod(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pod");

4
api/src/com/cloud/api/commands/DeletePoolCmd.java
View File

@ -36,7 +36,7 @@ public class DeletePoolCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -44,7 +44,7 @@ public class DeletePoolCmd extends BaseCmd {
public void execute(){
boolean result = _storageMgr.deletePool(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete storage pool");

4
api/src/com/cloud/api/commands/DeletePortForwardingRuleCmd.java
View File

@ -54,7 +54,7 @@ public class DeletePortForwardingRuleCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -62,7 +62,7 @@ public class DeletePortForwardingRuleCmd extends BaseCmd {
public void execute() throws ResourceUnavailableException {
PortForwardingRule result = _rulesService.revokePortForwardingRule(id, true);
if (result != null) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete port forwarding rule");

4
api/src/com/cloud/api/commands/DeletePreallocatedLunCmd.java
View File

@ -48,7 +48,7 @@ public class DeletePreallocatedLunCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -56,7 +56,7 @@ public class DeletePreallocatedLunCmd extends BaseCmd {
public void execute(){
boolean result = _mgr.unregisterPreallocatedLun(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete preallocated lun");

4
api/src/com/cloud/api/commands/DeleteRemoteAccessVpnCmd.java
View File

@ -74,7 +74,7 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -112,7 +112,7 @@ public class DeleteRemoteAccessVpnCmd extends BaseAsyncCmd {
try {
boolean result = _networkService.destroyRemoteAccessVpn(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete remote access vpn");

4
api/src/com/cloud/api/commands/DeleteServiceOfferingCmd.java
View File

@ -54,7 +54,7 @@ public class DeleteServiceOfferingCmd extends BaseCmd{
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -62,7 +62,7 @@ public class DeleteServiceOfferingCmd extends BaseCmd{
public void execute(){
boolean result = _configService.deleteServiceOffering(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete service offering");

4
api/src/com/cloud/api/commands/DeleteSnapshotCmd.java
View File

@ -58,7 +58,7 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -94,7 +94,7 @@ public class DeleteSnapshotCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _snapshotMgr.deleteSnapshot(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete snapshot");

4
api/src/com/cloud/api/commands/DeleteSnapshotPoliciesCmd.java
View File

@ -64,7 +64,7 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -72,7 +72,7 @@ public class DeleteSnapshotPoliciesCmd extends BaseCmd {
public void execute(){
boolean result = _snapshotMgr.deleteSnapshotPolicies(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete snapshot policy");

4
api/src/com/cloud/api/commands/DeleteTemplateCmd.java
View File

@ -66,7 +66,7 @@ public class DeleteTemplateCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -106,7 +106,7 @@ public class DeleteTemplateCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _templateService.deleteTemplate(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete template");

4
api/src/com/cloud/api/commands/DeleteUserCmd.java
View File

@ -63,7 +63,7 @@ public class DeleteUserCmd extends BaseAsyncCmd {
}
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -92,7 +92,7 @@ public class DeleteUserCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _accountService.deleteUser(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete user");

4
api/src/com/cloud/api/commands/DeleteVMGroupCmd.java
View File

@ -51,7 +51,7 @@ public class DeleteVMGroupCmd extends BaseCmd{
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -59,7 +59,7 @@ public class DeleteVMGroupCmd extends BaseCmd{
public void execute(){
boolean result = _userVmService.deleteVmGroup(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete vm group");

4
api/src/com/cloud/api/commands/DeleteVlanIpRangeCmd.java
View File

@ -53,7 +53,7 @@ public class DeleteVlanIpRangeCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -61,7 +61,7 @@ public class DeleteVlanIpRangeCmd extends BaseCmd {
public void execute(){
boolean result = _configService.deleteVlanIpRange(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete vlan ip range");

4
api/src/com/cloud/api/commands/DeleteVolumeCmd.java
View File

@ -54,7 +54,7 @@ public class DeleteVolumeCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -66,7 +66,7 @@ public class DeleteVolumeCmd extends BaseCmd {
public void execute(){
boolean result = _storageMgr.deleteVolume(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete volume");

4
api/src/com/cloud/api/commands/DeleteZoneCmd.java
View File

@ -55,7 +55,7 @@ public class DeleteZoneCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -63,7 +63,7 @@ public class DeleteZoneCmd extends BaseCmd {
public void execute(){
boolean result = _configService.deleteZone(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete zone");

4
api/src/com/cloud/api/commands/DeployVMCmd.java
View File

@ -172,7 +172,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -221,7 +221,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd {
result = _userVmService.startVirtualMachine(this);
if (result != null) {
UserVmResponse response = _responseGenerator.createUserVmResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to deploy vm");

4
api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java
View File

@ -59,7 +59,7 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -87,7 +87,7 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd {
public void execute(){
boolean result = _consoleProxyMgr.destroyConsoleProxy(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to destroy console proxy");

2
api/src/com/cloud/api/commands/DestroyVMCmd.java
View File

@ -59,7 +59,7 @@ public class DestroyVMCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}

2
api/src/com/cloud/api/commands/DetachIsoCmd.java
View File

@ -56,7 +56,7 @@ public class DetachIsoCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}

2
api/src/com/cloud/api/commands/DetachVolumeCmd.java
View File

@ -71,7 +71,7 @@ public class DetachVolumeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}

4
api/src/com/cloud/api/commands/DisableAccountCmd.java
View File

@ -62,7 +62,7 @@ public class DisableAccountCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -91,7 +91,7 @@ public class DisableAccountCmd extends BaseAsyncCmd {
Account result = _accountService.disableAccount(this);
if (result != null){
AccountResponse response = _responseGenerator.createAccountResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disable account");

4
api/src/com/cloud/api/commands/DisableUserCmd.java
View File

@ -56,7 +56,7 @@ public class DisableUserCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -86,7 +86,7 @@ public class DisableUserCmd extends BaseAsyncCmd {
UserAccount user = _accountService.disableUser(this);
if (user != null){
UserResponse response = _responseGenerator.createUserResponse(user);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disable user");

4
api/src/com/cloud/api/commands/DisassociateIPAddrCmd.java
View File

@ -52,7 +52,7 @@ public class DisassociateIPAddrCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -60,7 +60,7 @@ public class DisassociateIPAddrCmd extends BaseCmd {
public void execute(){
boolean result = _networkService.disassociateIpAddress(this);
if (result) {
SuccessResponse response = new SuccessResponse(getName());
SuccessResponse response = new SuccessResponse(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to disassociate ip address");

4
api/src/com/cloud/api/commands/EnableAccountCmd.java
View File

@ -59,7 +59,7 @@ public class EnableAccountCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -68,7 +68,7 @@ public class EnableAccountCmd extends BaseCmd {
Account result = _accountService.enableAccount(this);
if (result != null){
AccountResponse response = _responseGenerator.createAccountResponse(result);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to enable account");

4
api/src/com/cloud/api/commands/EnableUserCmd.java
View File

@ -54,7 +54,7 @@ public class EnableUserCmd extends BaseCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -63,7 +63,7 @@ public class EnableUserCmd extends BaseCmd {
UserAccount user = _accountService.enableUser(this);
if (user != null){
UserResponse response = _responseGenerator.createUserResponse(user);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to enable user");

4
api/src/com/cloud/api/commands/ExtractIsoCmd.java
View File

@ -78,7 +78,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -121,7 +121,7 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
Long uploadId = _templateService.extract(this);
if (uploadId != null){
ExtractResponse response = _responseGenerator.createExtractResponse(uploadId, id, zoneId, getEntityOwnerId(), mode);
response.setResponseName(getName());
response.setResponseName(getCommandName());
response.setObjectName("iso");
this.setResponseObject(response);
} else {

4
api/src/com/cloud/api/commands/ExtractTemplateCmd.java
View File

@ -79,7 +79,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -122,7 +122,7 @@ public class ExtractTemplateCmd extends BaseAsyncCmd {
Long uploadId = _templateService.extract(this);
if (uploadId != null){
ExtractResponse response = _responseGenerator.createExtractResponse(uploadId, id, zoneId, getEntityOwnerId(), mode);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to extract template");

4
api/src/com/cloud/api/commands/ExtractVolumeCmd.java
View File

@ -85,7 +85,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -129,7 +129,7 @@ public class ExtractVolumeCmd extends BaseAsyncCmd {
if (uploadId != null){
Upload uploadInfo = _entityMgr.findById(Upload.class, uploadId);
ExtractResponse response = new ExtractResponse();
response.setResponseName(getName());
response.setResponseName(getCommandName());
response.setObjectName("volume");
response.setId(id);
response.setName(_entityMgr.findById(Volume.class, id).getName());

4
api/src/com/cloud/api/commands/GetCloudIdentifierCmd.java
View File

@ -55,7 +55,7 @@ public class GetCloudIdentifierCmd extends BaseCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
public String getName() {
public String getCommandName() {
return s_name;
}
@ -67,7 +67,7 @@ public class GetCloudIdentifierCmd extends BaseCmd {
response.setCloudIdentifier(result.get(0));
response.setSignature(result.get(1));
response.setObjectName("cloudidentifier");
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to get cloud identifier");

4
api/src/com/cloud/api/commands/ListAccountsCmd.java
View File

@ -91,7 +91,7 @@ public class ListAccountsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -106,7 +106,7 @@ public class ListAccountsCmd extends BaseListCmd {
accountResponses.add(acctResponse);
}
response.setResponses(accountResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}

4
api/src/com/cloud/api/commands/ListAlertsCmd.java
View File

@ -57,7 +57,7 @@ public class ListAlertsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -78,7 +78,7 @@ public class ListAlertsCmd extends BaseListCmd {
}
response.setResponses(alertResponseList);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListAsyncJobsCmd.java
View File

@ -67,7 +67,7 @@ public class ListAsyncJobsCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -81,7 +81,7 @@ public class ListAsyncJobsCmd extends BaseListCmd {
}
response.setResponses(jobResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
View File

@ -32,7 +32,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
private static final String s_name = "listcapabilitiesresponse";
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -43,7 +43,7 @@ public class ListCapabilitiesCmd extends BaseCmd {
response.setNetworkGroupsEnabled(capabilities.get("networkGroupsEnabled"));
response.setCloudStackVersion(capabilities.get("cloudStackVersion"));
response.setObjectName("capability");
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListCapacityCmd.java
View File

@ -81,7 +81,7 @@ public class ListCapacityCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -103,7 +103,7 @@ public class ListCapacityCmd extends BaseListCmd {
ListResponse<CapacityResponse> response = new ListResponse<CapacityResponse>();
List<CapacityResponse> capacityResponses = _responseGenerator.createCapacityResponse(result, s_percentFormat);
response.setResponses(capacityResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListCfgsByCmd.java
View File

@ -66,7 +66,7 @@ public class ListCfgsByCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -82,7 +82,7 @@ public class ListCfgsByCmd extends BaseListCmd {
}
response.setResponses(configResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListClustersCmd.java
View File

@ -79,7 +79,7 @@ public class ListClustersCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -95,7 +95,7 @@ public class ListClustersCmd extends BaseListCmd {
}
response.setResponses(clusterResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListDiskOfferingsCmd.java
View File

@ -70,7 +70,7 @@ public class ListDiskOfferingsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -86,7 +86,7 @@ public class ListDiskOfferingsCmd extends BaseListCmd {
}
response.setResponses(diskOfferingResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListDomainChildrenCmd.java
View File

@ -70,7 +70,7 @@ public class ListDomainChildrenCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -86,7 +86,7 @@ public class ListDomainChildrenCmd extends BaseListCmd {
}
response.setResponses(domainResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListDomainsCmd.java
View File

@ -70,7 +70,7 @@ public class ListDomainsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -86,7 +86,7 @@ public class ListDomainsCmd extends BaseListCmd {
}
response.setResponses(domainResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListEventsCmd.java
View File

@ -106,7 +106,7 @@ public class ListEventsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -120,7 +120,7 @@ public class ListEventsCmd extends BaseListCmd {
}
response.setResponses(eventResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListGuestOsCategoriesCmd.java
View File

@ -59,7 +59,7 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -78,7 +78,7 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
}
response.setResponses(osCatResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListGuestOsCmd.java
View File

@ -76,7 +76,7 @@ public class ListGuestOsCmd extends BaseListCmd {
}
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -96,7 +96,7 @@ public class ListGuestOsCmd extends BaseListCmd {
}
response.setResponses(osResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListHostsCmd.java
View File

@ -102,7 +102,7 @@ public class ListHostsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -123,7 +123,7 @@ public class ListHostsCmd extends BaseListCmd {
}
response.setResponses(hostResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListHypervisorsCmd.java
View File

@ -32,7 +32,7 @@ public class ListHypervisorsCmd extends BaseCmd {
private static final String s_name = "listhypervisorsresponse";
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -49,7 +49,7 @@ public class ListHypervisorsCmd extends BaseCmd {
}
response.setResponses(responses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListIpForwardingRulesCmd.java
View File

@ -60,7 +60,7 @@ public class ListIpForwardingRulesCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -92,7 +92,7 @@ public class ListIpForwardingRulesCmd extends BaseListCmd {
}
}
response.setResponses(ipForwardingResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}

4
api/src/com/cloud/api/commands/ListIsosCmd.java
View File

@ -129,7 +129,7 @@ public class ListIsosCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -160,7 +160,7 @@ public class ListIsosCmd extends BaseListCmd {
}
ListResponse<TemplateResponse> response = _responseGenerator.createIsoResponse(isoZonePairSet, isAdmin, account);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

15
api/src/com/cloud/api/commands/ListLoadBalancerRuleInstancesCmd.java
View File

@ -63,7 +63,7 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -72,14 +72,15 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
List<? extends UserVm> result = _lbService.listLoadBalancerInstances(this);
ListResponse<UserVmResponse> response = new ListResponse<UserVmResponse>();
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
for (UserVm instance : result) {
UserVmResponse userVmResponse = _responseGenerator.createUserVmResponse(instance);
userVmResponse.setObjectName("loadbalancerruleinstance");
vmResponses.add(userVmResponse);
if (result != null) {
for (UserVm instance : result) {
UserVmResponse userVmResponse = _responseGenerator.createUserVmResponse(instance);
userVmResponse.setObjectName("loadbalancerruleinstance");
vmResponses.add(userVmResponse);
}
}
response.setResponses(vmResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListLoadBalancerRulesCmd.java
View File

@ -92,7 +92,7 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -109,7 +109,7 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd {
}
}
response.setResponses(lbResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

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

@ -76,7 +76,7 @@ public class ListNetworkGroupsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -85,7 +85,7 @@ public class ListNetworkGroupsCmd extends BaseListCmd {
List<? extends NetworkGroupRules> networkGroups = _networkGroupMgr.searchForNetworkGroupRules(this);
ListResponse<NetworkGroupResponse> response = _responseGenerator.createNetworkGroupResponses(networkGroups);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListNetworkOfferingsCmd.java
View File

@ -104,7 +104,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return _name;
}
@ -119,7 +119,7 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
}
response.setResponses(offeringResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListNetworksCmd.java
View File

@ -90,7 +90,7 @@ public class ListNetworksCmd extends BaseListCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return _name;
}
@ -105,7 +105,7 @@ public class ListNetworksCmd extends BaseListCmd {
}
response.setResponses(networkResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListPodsByCmd.java
View File

@ -72,7 +72,7 @@ public class ListPodsByCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -88,7 +88,7 @@ public class ListPodsByCmd extends BaseListCmd {
}
response.setResponses(podResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListPortForwardingRulesCmd.java
View File

@ -56,7 +56,7 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -72,7 +72,7 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
fwResponses.add(ruleData);
}
response.setResponses(fwResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListPreallocatedLunsCmd.java
View File

@ -65,7 +65,7 @@ public class ListPreallocatedLunsCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -82,7 +82,7 @@ public class ListPreallocatedLunsCmd extends BaseListCmd {
}
response.setResponses(lunResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListPublicIpAddressesCmd.java
View File

@ -99,7 +99,7 @@ public class ListPublicIpAddressesCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -115,7 +115,7 @@ public class ListPublicIpAddressesCmd extends BaseListCmd {
}
response.setResponses(ipAddrResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

4
api/src/com/cloud/api/commands/ListRecurringSnapshotScheduleCmd.java
View File

@ -59,7 +59,7 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
/////////////////////////////////////////////////////
@Override
public String getName() {
public String getCommandName() {
return s_name;
}
@ -80,7 +80,7 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
}
response.setResponses(snapshotScheduleResponses);
response.setResponseName(getName());
response.setResponseName(getCommandName());
this.setResponseObject(response);
}
}

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