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

More work on serializing responses. Now responses have to have the name set on them, and the name will eventually be serialized to the JSON/XML response the way it used to work for commands themselves [the result of cmd.getName() was written to the response string]. For list respones, we wrap the individual objects in a ListResponse object that has the name of the response, and the individual objects have the object name so that accounts will be something like <listaccountsresponse><account><...></account><account><...></account></listaccountsresponse>.

This commit is contained in:
Kris McQueen 2010-09-17 17:13:04 -07:00
parent a5f50d236f
commit e2e0e76063
95 changed files with 654 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/cloud/maid/dao/StackMaidDaoImpl.java
View File

@ -45,7 +45,7 @@ public class StackMaidDaoImpl extends GenericDaoBase<StackMaidVO, Long> implemen
delegateItem.setThreadId(Thread.currentThread().getId());
delegateItem.setSeq(seq);
delegateItem.setDelegate(delegateClzName);
delegateItem.setContext(SerializerHelper.toSerializedString(context));
delegateItem.setContext(SerializerHelper.toSerializedStringOld(context));
delegateItem.setCreated(DateUtil.currentGMTTime());
super.persist(delegateItem);

8
server/src/com/cloud/api/BaseAsyncCmd.java
View File

@ -1,8 +1,9 @@
package com.cloud.api;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.AsyncJobResponse;
import com.cloud.async.AsyncJobManager;
import com.cloud.async.AsyncJobVO;
import com.cloud.serializer.SerializerHelper;
/**
* A base command for supporting asynchronous API calls. When an API command is received, the command will be
@ -17,7 +18,10 @@ public abstract class BaseAsyncCmd extends BaseCmd {
public String getResponse(long jobId) {
// FIXME: We need a generic response object here, see BaseAsyncCreateCmd
return SerializerHelper.toSerializedString(Long.valueOf(jobId));
AsyncJobResponse response = new AsyncJobResponse();
response.setId(jobId);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
public void setAsyncJobManager(AsyncJobManager mgr) {

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

@ -1,7 +1,7 @@
package com.cloud.api;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.CreateCmdResponse;
import com.cloud.serializer.SerializerHelper;
public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {
@Parameter(name="id")
@ -19,6 +19,7 @@ public abstract class BaseAsyncCreateCmd extends BaseAsyncCmd {
CreateCmdResponse response = new CreateCmdResponse();
response.setJobId(jobId);
response.setId(objectId);
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/AddConfigCmd.java
View File

@ -26,9 +26,9 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ConfigurationResponse;
import com.cloud.configuration.ConfigurationVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="addConfig", manager=Manager.ConfigManager)
public class AddConfigCmd extends BaseCmd {
@ -109,6 +109,8 @@ public class AddConfigCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -32,14 +32,15 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.HostResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.host.Host;
import com.cloud.host.HostStats;
import com.cloud.host.HostVO;
import com.cloud.host.Status.Event;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.vm.UserVmVO;
@ -52,14 +53,17 @@ public class AddHostCmd extends AddHostOrStorageCmd {
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
return s_name;
}
@Override @SuppressWarnings("unchecked")
public String getResponse() {
List<HostVO> hosts = (List<HostVO>)getResponseObject();
List<HostResponse> response = new ArrayList<HostResponse>();
ListResponse response = new ListResponse();
List<HostResponse> hostResponses = new ArrayList<HostResponse>();
if (hosts != null) {
for (HostVO host : hosts) {
HostResponse hostResponse = new HostResponse();
@ -146,12 +150,15 @@ public class AddHostCmd extends AddHostOrStorageCmd {
}
hostResponse.setEvents(events);
}
response.add(hostResponse);
hostResponse.setResponseName("host");
hostResponses.add(hostResponse);
}
}else {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add host");
}
return SerializerHelper.toSerializedString(response);
response.setResponses(hostResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -31,11 +31,12 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.HostResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.host.HostVO;
import com.cloud.host.Status.Event;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOSCategoryVO;
@Implementation(method="discoverHosts", manager=Manager.AgentManager)
@ -72,15 +73,18 @@ public class AddSecondaryStorageCmd extends AddHostOrStorageCmd {
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
return s_name;
}
@Override @SuppressWarnings("unchecked")
public String getResponse() {
List<HostVO> hosts = (List<HostVO>)getResponseObject();
List<HostResponse> response = new ArrayList<HostResponse>();
ListResponse response = new ListResponse();
List<HostResponse> hostResponses = new ArrayList<HostResponse>();
if (hosts != null) {
for (HostVO host : hosts) {
HostResponse hostResponse = new HostResponse();
@ -137,12 +141,15 @@ public class AddSecondaryStorageCmd extends AddHostOrStorageCmd {
}
hostResponse.setEvents(events);
}
response.add(hostResponse);
hostResponse.setResponseName("secondarystorage");
hostResponses.add(hostResponse);
}
}else {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add secondary storage");
}
return SerializerHelper.toSerializedString(response);
response.setResponses(hostResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

9
server/src/com/cloud/api/commands/AssociateIPAddrCmd.java
View File

@ -25,11 +25,11 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.IPAddressResponse;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.network.IPAddressVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -82,10 +82,8 @@ public class AssociateIPAddrCmd extends BaseCmd {
}
public String getResponse() {
IPAddressResponse response = new IPAddressResponse();
IPAddressVO ipAddress = (IPAddressVO)getResponseObject();
VlanVO vlan = ApiDBUtils.findVlanById(ipAddress.getVlanDbId());
boolean forVirtualNetworks = vlan.getVlanType().equals(VlanType.VirtualNetwork);
@ -115,6 +113,7 @@ public class AssociateIPAddrCmd extends BaseCmd {
ipResponse.setVlanName(ApiDBUtils.findVlanById(ipAddress.getVlanDbId()).getVlanId());
}
return SerializerHelper.toSerializedString(response);
ipResponse.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(ipResponse);
}
}

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

@ -26,8 +26,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="attachIso", manager=Manager.TemplateManager)
public class AttachIsoCmd extends BaseAsyncCmd {
@ -78,6 +78,8 @@ public class AttachIsoCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to attach iso");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,8 +27,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.TemplateResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOS;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
@ -153,8 +153,9 @@ public class CopyIsoCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to copy iso");
}
return SerializerHelper.toSerializedString(isoResponse);
isoResponse.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(isoResponse);
}
}

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

@ -27,8 +27,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.TemplateResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOS;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
@ -157,7 +157,8 @@ public class CopyTemplateCmd extends BaseAsyncCmd {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to copy template");
}
return SerializerHelper.toSerializedString(templateResponse);
templateResponse.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(templateResponse);
}
}

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

@ -20,14 +20,14 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DiskOfferingResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.DiskOfferingVO;
@Implementation(method="createDiskOffering", manager=Manager.ConfigManager)
@ -104,6 +104,8 @@ public class CreateDiskOfferingCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create disk offering");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/CreateDomainCmd.java
View File

@ -25,9 +25,9 @@ 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.ApiResponseSerializer;
import com.cloud.api.response.DomainResponse;
import com.cloud.domain.DomainVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createDomain")
public class CreateDomainCmd extends BaseCmd {
@ -81,6 +81,8 @@ public class CreateDomainCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to create domain");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateIPForwardingRuleCmd.java
View File

@ -25,9 +25,9 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.FirewallRuleResponse;
import com.cloud.network.FirewallRuleVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.uservm.UserVm;
@Implementation(method="createPortForwardingRule", manager=Manager.NetworkManager)
@ -104,6 +104,7 @@ public class CreateIPForwardingRuleCmd extends BaseCmd {
fwResponse.setVirtualMachineId(vm.getId());
fwResponse.setVirtualMachineName(vm.getName());
return SerializerHelper.toSerializedString(fwResponse);
fwResponse.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(fwResponse);
}
}

7
server/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
View File

@ -20,14 +20,14 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.LoadBalancerResponse;
import com.cloud.network.LoadBalancerVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createLoadBalancerRule", manager=Manager.NetworkManager)
public class CreateLoadBalancerRuleCmd extends BaseCmd {
@ -111,6 +111,7 @@ public class CreateLoadBalancerRuleCmd extends BaseCmd {
response.setDomainId(responseObj.getDomainId());
response.setDomainName(ApiDBUtils.findDomainById(responseObj.getDomainId()).getName());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -20,14 +20,14 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.NetworkGroupResponse;
import com.cloud.network.security.NetworkGroupVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createLoadBalancerRule", manager=Manager.NetworkGroupManager)
public class CreateNetworkGroupCmd extends BaseCmd {
@ -93,6 +93,7 @@ public class CreateNetworkGroupCmd extends BaseCmd {
response.setId(group.getId());
response.setName(group.getName());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

7
server/src/com/cloud/api/commands/CreatePodCmd.java
View File

@ -20,14 +20,14 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.PodResponse;
import com.cloud.dc.HostPodVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createPod", manager=Manager.ConfigManager)
public class CreatePodCmd extends BaseCmd {
@ -109,6 +109,7 @@ public class CreatePodCmd extends BaseCmd {
response.setName(pod.getName());
response.setZoneId(pod.getDataCenterId());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreatePortForwardingServiceCmd.java
View File

@ -24,9 +24,9 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SecurityGroupResponse;
import com.cloud.network.SecurityGroupVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createPortForwardingService")
public class CreatePortForwardingServiceCmd extends BaseCmd {
@ -93,6 +93,7 @@ public class CreatePortForwardingServiceCmd extends BaseCmd {
response.setDomainId(group.getDomainId());
response.setDomainName(ApiDBUtils.findDomainById(group.getDomainId()).getName());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreatePortForwardingServiceRuleCmd.java
View File

@ -23,9 +23,9 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseAsyncCreateCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.PortForwardingServiceRuleResponse;
import com.cloud.network.NetworkRuleConfigVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(createMethod="createPortForwardingServiceRule", method="applyPortForwardingServiceRule")
public class CreatePortForwardingServiceRuleCmd extends BaseAsyncCreateCmd {
@ -95,6 +95,7 @@ public class CreatePortForwardingServiceRuleCmd extends BaseAsyncCreateCmd {
response.setProtocol(netRule.getProtocol());
response.setPublicPort(netRule.getPublicPort());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateServiceOfferingCmd.java
View File

@ -24,8 +24,8 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ServiceOfferingResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.service.ServiceOfferingVO;
@Implementation(method="createServiceOffering", manager=Manager.ConfigManager)
@ -129,6 +129,7 @@ public class CreateServiceOfferingCmd extends BaseCmd {
response.setStorageType(offering.getUseLocalStorage() ? "local" : "shared");
response.setTags(offering.getTags());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -25,8 +25,8 @@ import com.cloud.api.BaseAsyncCreateCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SnapshotResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.Snapshot.SnapshotType;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.VolumeVO;
@ -102,6 +102,7 @@ public class CreateSnapshotCmd extends BaseAsyncCreateCmd {
response.setCreated(snapshot.getCreated());
response.setName(snapshot.getName());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateSnapshotPolicyCmd.java
View File

@ -24,8 +24,8 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SnapshotPolicyResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.SnapshotPolicyVO;
@Implementation(method="createPolicy", manager=Manager.SnapshotManager)
@ -113,6 +113,7 @@ public class CreateSnapshotPolicyCmd extends BaseCmd {
response.setSchedule(snapshotPolicy.getSchedule());
response.setVolumeId(snapshotPolicy.getVolumeId());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateStoragePoolCmd.java
View File

@ -27,8 +27,8 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageStats;
@ -130,6 +130,7 @@ public class CreateStoragePoolCmd extends BaseCmd {
response.setDiskSizeTotal(pool.getCapacityBytes());
response.setDiskSizeAllocated(used);
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -20,20 +20,20 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCreateCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.TemplateResponse;
import com.cloud.dc.DataCenterVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOS;
import com.cloud.storage.Snapshot;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
import com.cloud.storage.VMTemplateVO;
import com.cloud.storage.VolumeVO;
import com.cloud.user.Account;
@Implementation(method="createPrivateTemplate", createMethod="createPrivateTemplateRecord", manager=Manager.UserVmManager)
@ -180,6 +180,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd {
response.setZoneName(zone.getName());
}
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateUserCmd.java
View File

@ -24,8 +24,8 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.UserResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.UserAccount;
@Implementation(method="createUser")
@ -135,6 +135,7 @@ public class CreateUserCmd extends BaseCmd {
response.setTimezone(user.getTimezone());
response.setUsername(user.getUsername());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateVlanIpRangeCmd.java
View File

@ -25,9 +25,9 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.VlanIpRangeResponse;
import com.cloud.dc.VlanVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createVlanAndPublicIpRange", manager=Manager.ConfigManager)
public class CreateVlanIpRangeCmd extends BaseCmd {
@ -151,6 +151,7 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
response.setPodName(ApiDBUtils.findPodById(podId).getName());
}
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -20,13 +20,13 @@ package com.cloud.api.commands;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseAsyncCreateCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.VolumeResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.VolumeVO;
@ -135,6 +135,7 @@ public class CreateVolumeCmd extends BaseAsyncCreateCmd {
response.setZoneId(volume.getDataCenterId());
response.setZoneName(ApiDBUtils.findZoneById(volume.getDataCenterId()).getName());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/CreateZoneCmd.java
View File

@ -24,9 +24,9 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ZoneResponse;
import com.cloud.dc.DataCenterVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="createZone", manager=Manager.ConfigManager)
public class CreateZoneCmd extends BaseCmd {
@ -115,6 +115,7 @@ public class CreateZoneCmd extends BaseCmd {
response.setVlan(zone.getVnet());
response.setGuestCidrAddress(zone.getGuestNetworkCidr());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
@Implementation(method="deleteDiskOffering", manager=Manager.ConfigManager)
public class DeleteDiskOfferingCmd extends BaseCmd {
@ -69,6 +69,8 @@ public class DeleteDiskOfferingCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete disk offering");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -23,8 +23,8 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseAsyncCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DeleteDomainResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="deleteDomain")
public class DeleteDomainCmd extends BaseAsyncCmd {
@ -71,6 +71,7 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
DeleteDomainResponse response = new DeleteDomainResponse();
response.setResult(deleteResult);
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
@Implementation(method="deleteHost", manager=Manager.AgentManager)
@ -71,6 +71,8 @@ public class DeleteHostCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete host");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
@Implementation(method="deleteIso", manager=Manager.TemplateManager)
public class DeleteIsoCmd extends BaseCmd {
@ -80,6 +80,8 @@ public class DeleteIsoCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete iso");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
@Implementation(method="deletePod", manager=Manager.ConfigManager)
public class DeletePodCmd extends BaseCmd {
@ -68,6 +68,8 @@ public class DeletePodCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pod");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -7,8 +7,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="deletePool", manager=Manager.StorageManager)
public class DeletePoolCmd extends BaseCmd {
@ -51,6 +51,8 @@ public class DeletePoolCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete pool");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/DeletePortForwardingServiceCmd.java
View File

@ -26,8 +26,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="deleteSecurityGroup", manager=Manager.ManagementServer)
public class DeletePortForwardingServiceCmd extends BaseAsyncCmd {
@ -68,6 +68,8 @@ public class DeletePortForwardingServiceCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to delete port forwarding service");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -20,8 +20,8 @@ package com.cloud.api.commands;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DeletePreallocatedLunResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="unregisterPreallocatedLun")
public class DeletePreallocatedLunCmd extends BaseCmd {
@ -58,6 +58,7 @@ public class DeletePreallocatedLunCmd extends BaseCmd {
DeletePreallocatedLunResponse response = new DeletePreallocatedLunResponse();
response.setSuccess(result);
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,9 +27,9 @@ import com.cloud.api.BaseAsyncCmd;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.UserVmResponse;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.VMTemplateVO;
import com.cloud.user.Account;
import com.cloud.user.User;
@ -249,6 +249,7 @@ public class DeployVMCmd extends BaseAsyncCmd {
response.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId()));
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
@Implementation(method="enableAccount", manager=Manager.ManagementServer)
public class EnableAccountCmd extends BaseCmd {
@ -76,6 +76,8 @@ public class EnableAccountCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to enable account");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/EnableUserCmd.java
View File

@ -25,8 +25,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="enableUser", manager=Manager.ManagementServer)
public class EnableUserCmd extends BaseCmd {
@ -68,6 +68,8 @@ public class EnableUserCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to enable user");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -29,7 +29,6 @@ import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.CloudIdentifierResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="getCloudIdentifierResponse", manager=Manager.ManagementServer)
public class GetCloudIdentifierCmd extends BaseCmd {
@ -64,7 +63,6 @@ public class GetCloudIdentifierCmd extends BaseCmd {
@Override @SuppressWarnings("unchecked")
public String getResponse() {
CloudIdentifierResponse response = new CloudIdentifierResponse();
response.se
ArrayList<String> responseObject = (ArrayList<String>)getResponseObject();
if (responseObject != null) {
response.setCloudIdentifier(responseObject.get(0));
@ -73,6 +71,7 @@ public class GetCloudIdentifierCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config");
}
return ApiResponseSerializer.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -31,8 +31,9 @@ import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.AccountResponse;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.configuration.ResourceCount.ResourceType;
import com.cloud.serializer.SerializerHelper;
import com.cloud.server.Criteria;
import com.cloud.user.Account;
import com.cloud.user.AccountVO;
@ -117,7 +118,9 @@ public class ListAccountsCmd extends BaseListCmd {
public String getResponse() {
List<AccountVO> accounts = (List<AccountVO>)getResponseObject();
List<AccountResponse> response = new ArrayList<AccountResponse>();
ListResponse response = new ListResponse();
List<AccountResponse> accountResponses = new ArrayList<AccountResponse>();
for (AccountVO account : accounts) {
boolean accountIsAdmin = (account.getType() == Account.ACCOUNT_TYPE_ADMIN);
@ -220,9 +223,12 @@ public class ListAccountsCmd extends BaseListCmd {
acctResponse.setCleanupRequired(account.getNeedsCleanup());
}
response.add(acctResponse);
acctResponse.setName("account");
accountResponses.add(acctResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(accountResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -28,7 +28,8 @@ import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.AlertResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
@Implementation(method="searchForALerts")
public class ListAlertsCmd extends BaseListCmd {
@ -67,6 +68,7 @@ public class ListAlertsCmd extends BaseListCmd {
public String getResponse() {
List<AlertVO> alertList = (List<AlertVO>)getResponseObject();
ListResponse response = new ListResponse();
List<AlertResponse> alertResponseList = new ArrayList<AlertResponse>();
for (AlertVO alert : alertList) {
AlertResponse alertResponse = new AlertResponse();
@ -74,9 +76,12 @@ public class ListAlertsCmd extends BaseListCmd {
alertResponse.setDescription(alert.getSubject());
alertResponse.setLastSent(alert.getLastSent());
alertResponse.setResponseName("alert");
alertResponseList.add(alertResponse);
}
return SerializerHelper.toSerializedString(alertResponseList);
response.setResponses(alertResponseList);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -24,9 +24,10 @@ import java.util.List;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.AsyncJobResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="searchForAsyncJobs")
public class ListAsyncJobsCmd extends BaseListCmd {
@ -75,7 +76,8 @@ public class ListAsyncJobsCmd extends BaseListCmd {
public String getResponse() {
List<AsyncJobVO> jobs = (List<AsyncJobVO>)getResponseObject();
List<AsyncJobResponse> response = new ArrayList<AsyncJobResponse>();
ListResponse response = new ListResponse();
List<AsyncJobResponse> jobResponses = new ArrayList<AsyncJobResponse>();
for (AsyncJobVO job : jobs) {
AsyncJobResponse jobResponse = new AsyncJobResponse();
jobResponse.setAccountId(job.getAccountId());
@ -90,9 +92,12 @@ public class ListAsyncJobsCmd extends BaseListCmd {
jobResponse.setJobStatus(job.getStatus());
jobResponse.setUserId(job.getUserId());
response.add(jobResponse);
jobResponse.setResponseName("asyncjobs");
jobResponses.add(jobResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(jobResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -33,9 +33,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.CapacityResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.capacity.CapacityVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.server.Criteria;
import com.cloud.storage.Storage.StoragePoolType;
import com.cloud.storage.StoragePoolVO;
@ -108,8 +109,9 @@ public class ListCapacityCmd extends BaseListCmd {
public String getResponse() {
List<CapacityVO> capacities = (List<CapacityVO>)getResponseObject();
ListResponse response = new ListResponse();
List<CapacityResponse> capacityResponses = new ArrayList<CapacityResponse>();
List<CapacityVO> summedCapacities = sumCapacities(capacities);
List<CapacityResponse> response = new ArrayList<CapacityResponse>();
for (CapacityVO summedCapacity : summedCapacities) {
CapacityResponse capacityResponse = new CapacityResponse();
capacityResponse.setCapacityTotal(summedCapacity.getTotalCapacity());
@ -124,9 +126,14 @@ public class ListCapacityCmd extends BaseListCmd {
} else {
capacityResponse.setPercentUsed(s_percentFormat.format(0L));
}
capacityResponse.setResponseName("capacity");
capacityResponses.add(capacityResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(capacityResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
private List<CapacityVO> sumCapacities(List<CapacityVO> hostCapacities) {

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

@ -26,9 +26,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ConfigurationResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.configuration.ConfigurationVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="searchForConfigurations")
public class ListCfgsByCmd extends BaseListCmd {
@ -73,7 +74,8 @@ public class ListCfgsByCmd extends BaseListCmd {
public String getResponse() {
List<ConfigurationVO> configurations = (List<ConfigurationVO>)getResponseObject();
List<ConfigurationResponse> response = new ArrayList<ConfigurationResponse>();
ListResponse response = new ListResponse();
List<ConfigurationResponse> configResponses = new ArrayList<ConfigurationResponse>();
for (ConfigurationVO cfg : configurations) {
ConfigurationResponse cfgResponse = new ConfigurationResponse();
cfgResponse.setCategory(cfg.getCategory());
@ -81,9 +83,12 @@ public class ListCfgsByCmd extends BaseListCmd {
cfgResponse.setName(cfg.getName());
cfgResponse.setValue(cfg.getValue());
response.add(cfgResponse);
cfgResponse.setResponseName("configuration");
configResponses.add(cfgResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(configResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -23,12 +23,16 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ClusterResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.dc.DataCenterVO;
import com.cloud.dc.HostPodVO;
@Implementation(method="searchForClusters")
public class ListClustersCmd extends BaseListCmd {
@ -86,20 +90,25 @@ public class ListClustersCmd extends BaseListCmd {
public String getResponse() {
List<ClusterVO> clusters = (List<ClusterVO>)getResponseObject();
List<ClusterResponse> response = new ArrayList<ClusterResponse>();
ListResponse response = new ListResponse();
List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();
for (ClusterVO cluster : clusters) {
ClusterResponse clusterResponse = new ClusterResponse();
clusterResponse.setId(cluster.getId());
clusterResponse.setName(cluster.getName());
clusterResponse.setPodId(cluster.getPodId());
clusterResponse.setZoneId(cluster.getDataCenterId());
// TODO: implement
// HostPodVO pod = getManagementServer().findHostPodById(cluster.getPodId());
// clusterResponse.setPodName(podName);
// DataCenterVO zone = getManagementServer().findDataCenterById(cluster.getDataCenterId());
// clusterResponse.setZoneName(zoneName);
HostPodVO pod = ApiDBUtils.findPodById(cluster.getPodId());
clusterResponse.setPodName(pod.getName());
DataCenterVO zone = ApiDBUtils.findZoneById(cluster.getDataCenterId());
clusterResponse.setZoneName(zone.getName());
clusterResponse.setResponseName("cluster");
clusterResponses.add(clusterResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(clusterResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -23,11 +23,14 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DiskOfferingResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ListResponse;
import com.cloud.domain.DomainVO;
import com.cloud.storage.DiskOfferingVO;
@Implementation(method="searchForDiskOfferings")
@ -80,7 +83,8 @@ public class ListDiskOfferingsCmd extends BaseListCmd {
public String getResponse() {
List<DiskOfferingVO> offerings = (List<DiskOfferingVO>)getResponseObject();
List<DiskOfferingResponse> response = new ArrayList<DiskOfferingResponse>();
ListResponse response = new ListResponse();
List<DiskOfferingResponse> diskOfferingResponses = new ArrayList<DiskOfferingResponse>();
for (DiskOfferingVO offering : offerings) {
DiskOfferingResponse diskOffResp = new DiskOfferingResponse();
diskOffResp.setCreated(offering.getCreated());
@ -90,12 +94,15 @@ public class ListDiskOfferingsCmd extends BaseListCmd {
diskOffResp.setId(offering.getId());
diskOffResp.setName(offering.getName());
diskOffResp.setTags(offering.getTags());
// TODO: implement
// getManagementServer().findDomainIdById(offering.getDomainId()).getName()
// diskOffResp.setDomain(domain);
DomainVO domain = ApiDBUtils.findDomainById(offering.getDomainId());
diskOffResp.setDomain(domain.getName());
diskOffResp.setResponseName("diskoffering");
diskOfferingResponses.add(diskOffResp);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(diskOfferingResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -23,12 +23,14 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DomainResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.domain.DomainVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="searchForDomainChildren")
public class ListDomainChildrenCmd extends BaseListCmd {
@ -80,23 +82,24 @@ public class ListDomainChildrenCmd extends BaseListCmd {
public String getResponse() {
List<DomainVO> domains = (List<DomainVO>)getResponseObject();
List<DomainResponse> response = new ArrayList<DomainResponse>();
ListResponse response = new ListResponse();
List<DomainResponse> domainResponses = new ArrayList<DomainResponse>();
for (DomainVO domain : domains) {
DomainResponse domainResponse = new DomainResponse();
domainResponse.setDomainName(domain.getName());
domainResponse.setId(domain.getId());
domainResponse.setLevel(domain.getLevel());
domainResponse.setParentDomainId(domain.getParent());
// TODO: implement
// if (domain.getParent() != null){
// domainData.add(new Pair<String, Object>(BaseCmd.Properties.PARENT_DOMAIN_ID.getName(), domain.getParent().toString()));
// domainResponse.setParentDomainName(domain.getParent());
// domainData.add(new Pair<String, Object>(BaseCmd.Properties.PARENT_DOMAIN_NAME.getName(),getManagementServer().findDomainIdById(domain.getParent()).getName()));
// }
if (domain.getParent() != null) {
domainResponse.setParentDomainName(ApiDBUtils.findDomainById(domain.getParent()).getName());
}
response.add(domainResponse);
domainResponse.setResponseName("domain");
domainResponses.add(domainResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(domainResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -23,12 +23,14 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DomainResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.domain.DomainVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="searchForDomains")
public class ListDomainsCmd extends BaseListCmd {
@ -80,19 +82,24 @@ public class ListDomainsCmd extends BaseListCmd {
public String getResponse() {
List<DomainVO> domains = (List<DomainVO>)getResponseObject();
List<DomainResponse> response = new ArrayList<DomainResponse>();
ListResponse response = new ListResponse();
List<DomainResponse> domainResponses = new ArrayList<DomainResponse>();
for (DomainVO domain : domains) {
DomainResponse domainResponse = new DomainResponse();
domainResponse.setDomainName(domain.getName());
domainResponse.setId(domain.getId());
domainResponse.setLevel(domain.getLevel());
domainResponse.setParentDomainId(domain.getParent());
// TODO: implement
// domainResponse.setParentDomainName(findDomainIdById(domain.getParent()).getName());
if (domain.getParent() != null) {
domainResponse.setParentDomainName(ApiDBUtils.findDomainById(domain.getParent()).getName());
}
response.add(domainResponse);
domainResponse.setResponseName("domain");
domainResponses.add(domainResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(domainResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -24,12 +24,15 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.EventResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.event.EventVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.User;
@Implementation(method="searchForEvents")
public class ListEventsCmd extends BaseListCmd {
@ -115,7 +118,8 @@ public class ListEventsCmd extends BaseListCmd {
public String getResponse() {
List<EventVO> events = (List<EventVO>)getResponseObject();
List<EventResponse> response = new ArrayList<EventResponse>();
ListResponse response = new ListResponse();
List<EventResponse> eventResponses = new ArrayList<EventResponse>();
for (EventVO event : events) {
EventResponse responseEvent = new EventResponse();
responseEvent.setAccountName(event.getAccountName());
@ -127,18 +131,18 @@ public class ListEventsCmd extends BaseListCmd {
responseEvent.setLevel(event.getLevel());
responseEvent.setParentId(event.getStartId());
responseEvent.setState(event.getState());
// TODO: implement
// responseEvent.setDomainName(event.getDomainName());
// eventData.add(new Pair<String, Object>(BaseCmd.Properties.DOMAIN.getName(), getManagementServer().findDomainIdById(acct.getDomainId()).getName()));
// responseEvent.setUsername(event.getUserId());
// User user = getManagementServer().findUserById(event.getUserId());
// if (user != null) {
// eventData.add(new Pair<String, Object>(BaseCmd.Properties.USERNAME.getName(), user.getUsername() ));
// }
responseEvent.setDomainName(ApiDBUtils.findDomainById(event.getDomainId()).getName());
User user = ApiDBUtils.findUserById(event.getUserId());
if (user != null) {
responseEvent.setUsername(user.getUsername());
}
response.add(responseEvent);
responseEvent.setResponseName("event");
eventResponses.add(responseEvent);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(eventResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,8 +26,9 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.GuestOSCategoryResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ListResponse;
import com.cloud.storage.GuestOSCategoryVO;
@Implementation(method="listGuestOSCategoriesByCriteria")
@ -66,15 +67,19 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
public String getResponse() {
List<GuestOSCategoryVO> osCategories = (List<GuestOSCategoryVO>)getResponseObject();
List<GuestOSCategoryResponse> response = new ArrayList<GuestOSCategoryResponse>();
ListResponse response = new ListResponse();
List<GuestOSCategoryResponse> osCatResponses = new ArrayList<GuestOSCategoryResponse>();
for (GuestOSCategoryVO osCategory : osCategories) {
GuestOSCategoryResponse categoryResponse = new GuestOSCategoryResponse();
categoryResponse.setId(osCategory.getId());
categoryResponse.setName(osCategory.getName());
response.add(categoryResponse);
categoryResponse.setResponseName("oscategory");
osCatResponses.add(categoryResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(osCatResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,8 +26,9 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.GuestOSResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ListResponse;
import com.cloud.storage.GuestOSVO;
@Implementation(method="listGuestOSByCriteria")
@ -73,16 +74,20 @@ public class ListGuestOsCmd extends BaseListCmd {
public String getResponse() {
List<GuestOSVO> guestOSList = (List<GuestOSVO>)getResponseObject();
List<GuestOSResponse> response = new ArrayList<GuestOSResponse>();
ListResponse response = new ListResponse();
List<GuestOSResponse> osResponses = new ArrayList<GuestOSResponse>();
for (GuestOSVO guestOS : guestOSList) {
GuestOSResponse guestOSResponse = new GuestOSResponse();
guestOSResponse.setDescription(guestOS.getDisplayName());
guestOSResponse.setId(guestOS.getId());
guestOSResponse.setOsCategoryId(guestOS.getCategoryId());
response.add(guestOSResponse);
guestOSResponse.setResponseName("ostype");
osResponses.add(guestOSResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(osResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -31,14 +31,15 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.HostResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.host.Host;
import com.cloud.host.HostStats;
import com.cloud.host.HostVO;
import com.cloud.host.Status.Event;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.vm.UserVmVO;
@ -120,7 +121,8 @@ public class ListHostsCmd extends BaseListCmd {
public String getResponse() {
List<HostVO> hosts = (List<HostVO>)getResponseObject();
List<HostResponse> response = new ArrayList<HostResponse>();
ListResponse response = new ListResponse();
List<HostResponse> hostResponses = new ArrayList<HostResponse>();
for (HostVO host : hosts) {
HostResponse hostResponse = new HostResponse();
hostResponse.setId(host.getId());
@ -207,9 +209,12 @@ public class ListHostsCmd extends BaseListCmd {
hostResponse.setEvents(events);
}
response.add(hostResponse);
hostResponse.setResponseName("host");
hostResponses.add(hostResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(hostResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -29,11 +29,12 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.TemplateResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.host.HostVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOS;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
@ -183,7 +184,8 @@ public class ListIsosCmd extends BaseListCmd {
}
}
List<TemplateResponse> response = new ArrayList<TemplateResponse>();
ListResponse response = new ListResponse();
List<TemplateResponse> isoResponses = new ArrayList<TemplateResponse>();
for (VMTemplateVO iso : isos) {
List<VMTemplateHostVO> isoHosts = isoHostsMap.get(iso.getId());
for (VMTemplateHostVO isoHost : isoHosts) {
@ -261,10 +263,13 @@ public class ListIsosCmd extends BaseListCmd {
isoResponse.setJobStatus(asyncJob.getStatus());
}
response.add(isoResponse);
isoResponse.setResponseName("iso");
isoResponses.add(isoResponse);
}
}
return SerializerHelper.toSerializedString(response);
response.setResponses(isoResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,8 +27,9 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.UserVmResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
import com.cloud.vm.UserVmVO;
@ -75,7 +76,8 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
public String getResponse() {
List<UserVmVO> instances = (List<UserVmVO>)getResponseObject();
List<UserVmResponse> response = new ArrayList<UserVmResponse>();
ListResponse response = new ListResponse();
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
for (UserVmVO instance : instances) {
UserVmResponse userVmResponse = new UserVmResponse();
userVmResponse.setId(instance.getId());
@ -83,7 +85,6 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
userVmResponse.setDisplayName(instance.getDisplayName());
userVmResponse.setPrivateIp(instance.getPrivateIpAddress());
// TODO: implement
Account accountTemp = ApiDBUtils.findAccountById(instance.getAccountId());
if (accountTemp != null) {
userVmResponse.setAccountName(accountTemp.getAccountName());
@ -91,9 +92,12 @@ public class ListLoadBalancerRuleInstancesCmd extends BaseListCmd {
userVmResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
response.add(userVmResponse);
userVmResponse.setResponseName("loadbalancerruleinstance");
vmResponses.add(userVmResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(vmResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,9 +27,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.LoadBalancerResponse;
import com.cloud.network.LoadBalancerVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
@Implementation(method="searchForLoadBalancers")
@ -102,7 +103,8 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd {
public String getResponse() {
List<LoadBalancerVO> loadBalancers = (List<LoadBalancerVO>)getResponseObject();
List<LoadBalancerResponse> response = new ArrayList<LoadBalancerResponse>();
ListResponse response = new ListResponse();
List<LoadBalancerResponse> lbResponses = new ArrayList<LoadBalancerResponse>();
for (LoadBalancerVO loadBalancer : loadBalancers) {
LoadBalancerResponse lbResponse = new LoadBalancerResponse();
lbResponse.setId(loadBalancer.getId());
@ -113,7 +115,6 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd {
lbResponse.setPrivatePort(loadBalancer.getPrivatePort());
lbResponse.setAlgorithm(loadBalancer.getAlgorithm());
// TODO: implement
Account accountTemp = ApiDBUtils.findAccountById(loadBalancer.getAccountId());
if (accountTemp != null) {
lbResponse.setAccountName(accountTemp.getAccountName());
@ -121,9 +122,12 @@ public class ListLoadBalancerRulesCmd extends BaseListCmd {
lbResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
response.add(lbResponse);
lbResponse.setResponseName("loadbalancerrule");
lbResponses.add(lbResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(lbResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -5,17 +5,18 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.IngressRuleResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.NetworkGroupResponse;
import com.cloud.async.executor.IngressRuleResultObject;
import com.cloud.async.executor.NetworkGroupResultObject;
import com.cloud.network.security.NetworkGroupRulesVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="searchForNetworkGroupRules", manager=Manager.NetworkGroupManager)
public class ListNetworkGroupsCmd extends BaseListCmd {
@ -74,7 +75,8 @@ public class ListNetworkGroupsCmd extends BaseListCmd {
List<NetworkGroupRulesVO> networkGroups = (List<NetworkGroupRulesVO>)getResponseObject();
List<NetworkGroupResultObject> groupResultObjs = NetworkGroupResultObject.transposeNetworkGroups(networkGroups);
List<NetworkGroupResponse> response = new ArrayList<NetworkGroupResponse>();
ListResponse response = new ListResponse();
List<NetworkGroupResponse> netGrpResponses = new ArrayList<NetworkGroupResponse>();
for (NetworkGroupResultObject networkGroup : groupResultObjs) {
NetworkGroupResponse netGrpResponse = new NetworkGroupResponse();
netGrpResponse.setId(networkGroup.getId());
@ -108,13 +110,17 @@ public class ListNetworkGroupsCmd extends BaseListCmd {
ingressData.setCidr(ingressRule.getAllowedSourceIpCidr());
}
ingressData.setResponseName("ingressrule");
ingressRulesResponse.add(ingressData);
}
netGrpResponse.setIngressRules(ingressRulesResponse);
}
response.add(netGrpResponse);
netGrpResponse.setResponseName("networkgroup");
netGrpResponses.add(netGrpResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(netGrpResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,9 +26,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.PodResponse;
import com.cloud.dc.HostPodVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.test.PodZoneConfig;
@Implementation(method="searchForPods")
@ -80,7 +81,8 @@ public class ListPodsByCmd extends BaseListCmd {
public String getResponse() {
List<HostPodVO> pods = (List<HostPodVO>)getResponseObject();
List<PodResponse> response = new ArrayList<PodResponse>();
ListResponse response = new ListResponse();
List<PodResponse> podResponses = new ArrayList<PodResponse>();
for (HostPodVO pod : pods) {
String[] ipRange = new String[2];
if (pod.getDescription() != null && pod.getDescription().length() > 0) {
@ -99,9 +101,12 @@ public class ListPodsByCmd extends BaseListCmd {
podResponse.setEndIp(((ipRange.length > 1) && (ipRange[1] != null)) ? ipRange[1] : "");
podResponse.setGateway(pod.getGateway());
response.add(podResponse);
podResponse.setResponseName("pod");
podResponses.add(podResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(podResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -30,10 +30,11 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.FirewallRuleResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.network.FirewallRuleVO;
import com.cloud.network.IPAddressVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.server.Criteria;
import com.cloud.vm.UserVmVO;
@ -74,7 +75,8 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
Map<String, UserVmVO> userVmCache = new HashMap<String, UserVmVO>();
IPAddressVO ipAddr = ApiDBUtils.findIpAddressById(ipAddress);
List<FirewallRuleResponse> response = new ArrayList<FirewallRuleResponse>();
ListResponse response = new ListResponse();
List<FirewallRuleResponse> fwResponses = new ArrayList<FirewallRuleResponse>();
for (FirewallRuleVO fwRule : firewallRules) {
FirewallRuleResponse ruleData = new FirewallRuleResponse();
@ -102,9 +104,12 @@ public class ListPortForwardingRulesCmd extends BaseListCmd {
ruleData.setVirtualMachineName(userVM.getName());
}
response.add(ruleData);
ruleData.setResponseName("portforwardingrule");
fwResponses.add(ruleData);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(fwResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,10 +27,11 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.PortForwardingServiceRuleResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.network.NetworkRuleConfigVO;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="searchForNetworkRules")
public class ListPortForwardingServiceRulesCmd extends BaseListCmd {
@ -88,7 +89,8 @@ public class ListPortForwardingServiceRulesCmd extends BaseListCmd {
public String getResponse() {
List<NetworkRuleConfigVO> portForwardingServiceRules = (List<NetworkRuleConfigVO>)getResponseObject();
List<PortForwardingServiceRuleResponse> response = new ArrayList<PortForwardingServiceRuleResponse>();
ListResponse response = new ListResponse();
List<PortForwardingServiceRuleResponse> ruleResponses = new ArrayList<PortForwardingServiceRuleResponse>();
for (NetworkRuleConfigVO rule : portForwardingServiceRules) {
PortForwardingServiceRuleResponse ruleResponse = new PortForwardingServiceRuleResponse();
ruleResponse.setRuleId(rule.getId());
@ -103,9 +105,12 @@ public class ListPortForwardingServiceRulesCmd extends BaseListCmd {
ruleResponse.setJobStatus(asyncJob.getStatus());
}
response.add(ruleResponse);
ruleResponse.setResponseName("portforwardingservicerule");
ruleResponses.add(ruleResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(ruleResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -28,9 +28,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SecurityGroupResponse;
import com.cloud.network.SecurityGroupVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
@Implementation(method="searchForSecurityGroupsByVM")
@ -89,7 +90,8 @@ public class ListPortForwardingServicesByVmCmd extends BaseListCmd {
public String getResponse() {
Map<String, List<SecurityGroupVO>> portForwardingServices = (Map<String, List<SecurityGroupVO>>)getResponseObject();
List<SecurityGroupResponse> response = new ArrayList<SecurityGroupResponse>();
ListResponse response = new ListResponse();
List<SecurityGroupResponse> pfResponses = new ArrayList<SecurityGroupResponse>();
for (String addr : portForwardingServices.keySet()) {
List<SecurityGroupVO> appliedGroup = portForwardingServices.get(addr);
for (SecurityGroupVO group : appliedGroup) {
@ -106,10 +108,13 @@ public class ListPortForwardingServicesByVmCmd extends BaseListCmd {
pfsData.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
response.add(pfsData);
pfsData.setResponseName("portforwardingservice");
pfResponses.add(pfsData);
}
}
return SerializerHelper.toSerializedString(response);
response.setResponses(pfResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,9 +27,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SecurityGroupResponse;
import com.cloud.network.SecurityGroupVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
@Implementation(method="searchForSecurityGroups")
@ -88,7 +89,8 @@ public class ListPortForwardingServicesCmd extends BaseListCmd {
public String getResponse() {
List<SecurityGroupVO> groups = (List<SecurityGroupVO>)getResponseObject();
List<SecurityGroupResponse> response = new ArrayList<SecurityGroupResponse>();
ListResponse response = new ListResponse();
List<SecurityGroupResponse> pfsResponses = new ArrayList<SecurityGroupResponse>();
for (SecurityGroupVO group : groups) {
SecurityGroupResponse pfsData = new SecurityGroupResponse();
pfsData.setId(group.getId());
@ -102,10 +104,13 @@ public class ListPortForwardingServicesCmd extends BaseListCmd {
pfsData.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
response.add(pfsData);
pfsData.setResponseName("portforwardingservice");
pfsResponses.add(pfsData);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(pfsResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,8 +26,9 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.PreallocatedLunResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.preallocatedlun.PreallocatedLunVO;
@Implementation(method="getPreAllocatedLuns")
@ -71,7 +72,8 @@ public class ListPreallocatedLunsCmd extends BaseListCmd {
public String getResponse() {
List<PreallocatedLunVO> preallocatedLuns = (List<PreallocatedLunVO>)getResponseObject();
List<PreallocatedLunResponse> response = new ArrayList<PreallocatedLunResponse>();
ListResponse response = new ListResponse();
List<PreallocatedLunResponse> lunResponses = new ArrayList<PreallocatedLunResponse>();
for (PreallocatedLunVO preallocatedLun : preallocatedLuns) {
PreallocatedLunResponse preallocLunResponse = new PreallocatedLunResponse();
preallocLunResponse.setId(preallocatedLun.getId());
@ -83,9 +85,12 @@ public class ListPreallocatedLunsCmd extends BaseListCmd {
preallocLunResponse.setTaken(preallocatedLun.getTaken());
preallocLunResponse.setTargetIqn(preallocatedLun.getTargetIqn());
response.add(preallocLunResponse);
preallocLunResponse.setResponseName("preallocatedlun");
lunResponses.add(preallocLunResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(lunResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,11 +27,12 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.IPAddressResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.network.IPAddressVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -111,7 +112,8 @@ public class ListPublicIpAddressesCmd extends BaseListCmd {
public String getResponse() {
List<IPAddressVO> ipAddresses = (List<IPAddressVO>)getResponseObject();
List<IPAddressResponse> response = new ArrayList<IPAddressResponse>();
ListResponse response = new ListResponse();
List<IPAddressResponse> ipAddrResponses = new ArrayList<IPAddressResponse>();
for (IPAddressVO ipAddress : ipAddresses) {
VlanVO vlan = ApiDBUtils.findVlanById(ipAddress.getVlanDbId());
boolean forVirtualNetworks = vlan.getVlanType().equals(VlanType.VirtualNetwork);
@ -142,9 +144,12 @@ public class ListPublicIpAddressesCmd extends BaseListCmd {
ipResponse.setVlanName(ApiDBUtils.findVlanById(ipAddress.getVlanDbId()).getVlanId());
}
response.add(ipResponse);
ipResponse.setResponseName("publicipaddress");
ipAddrResponses.add(ipResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(ipAddrResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -25,8 +25,9 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SnapshotScheduleResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.SnapshotScheduleVO;
@Implementation(method="findRecurringSnapshotSchedule", manager=Manager.SnapshotManager)
@ -68,7 +69,8 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
public String getResponse() {
List<SnapshotScheduleVO> snapshotSchedules = (List<SnapshotScheduleVO>)getResponseObject();
List<SnapshotScheduleResponse> response = new ArrayList<SnapshotScheduleResponse>();
ListResponse response = new ListResponse();
List<SnapshotScheduleResponse> snapshotScheduleResponses = new ArrayList<SnapshotScheduleResponse>();
for (SnapshotScheduleVO snapshotSchedule : snapshotSchedules) {
SnapshotScheduleResponse snapSchedResponse = new SnapshotScheduleResponse();
snapSchedResponse.setId(snapshotSchedule.getId());
@ -76,9 +78,12 @@ public class ListRecurringSnapshotScheduleCmd extends BaseListCmd {
snapSchedResponse.setSnapshotPolicyId(snapshotSchedule.getPolicyId());
snapSchedResponse.setScheduled(snapshotSchedule.getScheduledTimestamp());
response.add(snapSchedResponse);
snapSchedResponse.setResponseName("snapshot");
snapshotScheduleResponses.add(snapSchedResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(snapshotScheduleResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -23,14 +23,15 @@ import java.util.List;
import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.ResourceLimitResponse;
import com.cloud.configuration.ResourceLimitVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
@Implementation(method="searchForLimits", manager=Manager.AccountManager)
@ -88,7 +89,8 @@ public class ListResourceLimitsCmd extends BaseListCmd {
public String getResponse() {
List<ResourceLimitVO> limits = (List<ResourceLimitVO>)getResponseObject();
List<ResourceLimitResponse> response = new ArrayList<ResourceLimitResponse>();
ListResponse response = new ListResponse();
List<ResourceLimitResponse> limitResponses = new ArrayList<ResourceLimitResponse>();
for (ResourceLimitVO limit : limits) {
ResourceLimitResponse resourceLimitResponse = new ResourceLimitResponse();
if (limit.getDomainId() != null) {
@ -108,9 +110,12 @@ public class ListResourceLimitsCmd extends BaseListCmd {
resourceLimitResponse.setResourceType(limit.getType().ordinal());
resourceLimitResponse.setMax(limit.getMax());
response.add(resourceLimitResponse);
resourceLimitResponse.setResponseName("resourcelimit");
limitResponses.add(resourceLimitResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(limitResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,9 +27,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DomainRouterResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
import com.cloud.vm.DomainRouterVO;
@ -109,7 +110,8 @@ public class ListRoutersCmd extends BaseListCmd {
public String getResponse() {
List<DomainRouterVO> routers = (List<DomainRouterVO>)getResponseObject();
List<DomainRouterResponse> response = new ArrayList<DomainRouterResponse>();
ListResponse response = new ListResponse();
List<DomainRouterResponse> routerResponses = new ArrayList<DomainRouterResponse>();
for (DomainRouterVO router : routers) {
DomainRouterResponse routerResponse = new DomainRouterResponse();
routerResponse.setId(router.getId());
@ -154,9 +156,12 @@ public class ListRoutersCmd extends BaseListCmd {
routerResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
response.add(routerResponse);
routerResponse.setResponseName("router");
routerResponses.add(routerResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(routerResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,9 +26,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.ServiceOfferingResponse;
import com.cloud.offering.ServiceOffering.GuestIpType;
import com.cloud.serializer.SerializerHelper;
import com.cloud.service.ServiceOfferingVO;
@Implementation(method="searchForServiceOfferings")
@ -79,7 +80,8 @@ public class ListServiceOfferingsCmd extends BaseListCmd {
public String getResponse() {
List<ServiceOfferingVO> offerings = (List<ServiceOfferingVO>)getResponseObject();
List<ServiceOfferingResponse> response = new ArrayList<ServiceOfferingResponse>();
ListResponse response = new ListResponse();
List<ServiceOfferingResponse> offeringResponses = new ArrayList<ServiceOfferingResponse>();
for (ServiceOfferingVO offering : offerings) {
ServiceOfferingResponse offeringResponse = new ServiceOfferingResponse();
offeringResponse.setId(offering.getId());
@ -94,9 +96,12 @@ public class ListServiceOfferingsCmd extends BaseListCmd {
offeringResponse.setUseVirtualNetwork(offering.getGuestIpType().equals(GuestIpType.Virtualized));
offeringResponse.setTags(offering.getTags());
response.add(offeringResponse);
offeringResponse.setResponseName("serviceoffering");
offeringResponses.add(offeringResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(offeringResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,8 +27,9 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SnapshotPolicyResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.SnapshotPolicyVO;
@Implementation(method="listPoliciesforVolume", manager=Manager.SnapshotManager)
@ -79,7 +80,8 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd {
public String getResponse() {
List<SnapshotPolicyVO> policies = (List<SnapshotPolicyVO>)getResponseObject();
List<SnapshotPolicyResponse> response = new ArrayList<SnapshotPolicyResponse>();
ListResponse response = new ListResponse();
List<SnapshotPolicyResponse> policyResponses = new ArrayList<SnapshotPolicyResponse>();
for (SnapshotPolicyVO policy : policies) {
SnapshotPolicyResponse policyResponse = new SnapshotPolicyResponse();
policyResponse.setId(policy.getId());
@ -89,9 +91,12 @@ public class ListSnapshotPoliciesCmd extends BaseListCmd {
policyResponse.setMaxSnaps(policy.getMaxSnaps());
policyResponse.setTimezone(policy.getTimezone());
response.add(policyResponse);
policyResponse.setResponseName("snapshotpolicy");
policyResponses.add(policyResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(policyResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,9 +27,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SnapshotResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.Snapshot;
import com.cloud.storage.Snapshot.SnapshotType;
import com.cloud.storage.SnapshotVO;
@ -112,7 +113,8 @@ public class ListSnapshotsCmd extends BaseListCmd {
public String getResponse() {
List<SnapshotVO> snapshots = (List<SnapshotVO>)getResponseObject();
List<SnapshotResponse> response = new ArrayList<SnapshotResponse>();
ListResponse response = new ListResponse();
List<SnapshotResponse> snapshotResponses = new ArrayList<SnapshotResponse>();
for (Snapshot snapshot : snapshots) {
SnapshotResponse snapshotResponse = new SnapshotResponse();
snapshotResponse.setId(snapshot.getId());
@ -140,9 +142,12 @@ public class ListSnapshotsCmd extends BaseListCmd {
}
snapshotResponse.setIntervalType(ApiDBUtils.getSnapshotIntervalTypes(snapshot.getId()));
response.add(snapshotResponse);
snapshotResponse.setResponseName("snapshot");
snapshotResponses.add(snapshotResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(snapshotResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

17
server/src/com/cloud/api/commands/ListStoragePoolsAndHostsCmd.java
View File

@ -31,7 +31,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ResponseObject;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.HostResponse;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.host.Host;
@ -39,7 +42,6 @@ import com.cloud.host.HostStats;
import com.cloud.host.HostVO;
import com.cloud.host.Status.Event;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageStats;
@ -121,18 +123,21 @@ public class ListStoragePoolsAndHostsCmd extends BaseListCmd {
public String getResponse() {
List<Object> poolsAndHosts = (List<Object>)getResponseObject();
List<Object> response = new ArrayList<Object>();
ListResponse response = new ListResponse();
List<ResponseObject> responses = new ArrayList<ResponseObject>();
for (Object poolOrHost : poolsAndHosts) {
if (poolOrHost instanceof StoragePoolVO) {
StoragePoolVO pool = (StoragePoolVO)poolOrHost;
response.add(constructStoragePoolResponse(pool));
responses.add(constructStoragePoolResponse(pool));
} else if (poolOrHost instanceof HostVO) {
HostVO host = (HostVO)poolOrHost;
response.add(constructHostResponse(host));
responses.add(constructHostResponse(host));
}
}
return SerializerHelper.toSerializedString(response);
response.setResponses(responses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
private StoragePoolResponse constructStoragePoolResponse(StoragePoolVO pool) {
@ -174,6 +179,7 @@ public class ListStoragePoolsAndHostsCmd extends BaseListCmd {
}
poolResponse.setTags(ApiDBUtils.getStoragePoolTags(pool.getId()));
poolResponse.setResponseName("storagepools");
return poolResponse;
}
@ -264,6 +270,7 @@ public class ListStoragePoolsAndHostsCmd extends BaseListCmd {
hostResponse.setEvents(events);
}
hostResponse.setResponseName("host");
return hostResponse;
}
}

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

@ -27,9 +27,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.StoragePoolResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.StoragePoolVO;
import com.cloud.storage.StorageStats;
@ -102,7 +103,8 @@ public class ListStoragePoolsCmd extends BaseListCmd {
public String getResponse() {
List<? extends StoragePoolVO> pools = (List<? extends StoragePoolVO>)getResponseObject();
List<StoragePoolResponse> response = new ArrayList<StoragePoolResponse>();
ListResponse response = new ListResponse();
List<StoragePoolResponse> poolResponses = new ArrayList<StoragePoolResponse>();
for (StoragePoolVO pool : pools) {
StoragePoolResponse poolResponse = new StoragePoolResponse();
poolResponse.setId(pool.getId());
@ -143,9 +145,12 @@ public class ListStoragePoolsCmd extends BaseListCmd {
poolResponse.setTags(ApiDBUtils.getStoragePoolTags(pool.getId()));
response.add(poolResponse);
poolResponse.setResponseName("storagepool");
poolResponses.add(poolResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(poolResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,9 +26,10 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.SystemVmResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.SystemVm;
@ -110,7 +111,8 @@ public class ListSystemVMsCmd extends BaseListCmd {
public String getResponse() {
List<? extends VMInstanceVO> systemVMs = (List<? extends VMInstanceVO>)getResponseObject();
List<SystemVmResponse> response = new ArrayList<SystemVmResponse>();
ListResponse response = new ListResponse();
List<SystemVmResponse> vmResponses = new ArrayList<SystemVmResponse>();
for (VMInstanceVO systemVM : systemVMs) {
SystemVmResponse vmResponse = new SystemVmResponse();
if (systemVM instanceof SystemVm) {
@ -162,9 +164,12 @@ public class ListSystemVMsCmd extends BaseListCmd {
vmResponse.setActiveViewerSessions(proxy.getActiveSession());
}
response.add(vmResponse);
vmResponse.setResponseName("systemvm");
vmResponses.add(vmResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(vmResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -8,8 +8,8 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.TemplatePermissionsResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.VMTemplateVO;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -81,7 +81,8 @@ public class ListTemplateOrIsoPermissionsCmd extends BaseListCmd {
response.setAccountNames(accountNames);
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
protected boolean templateIsCorrectType(VMTemplateVO template) {

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

@ -27,11 +27,12 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.TemplateResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.dc.DataCenterVO;
import com.cloud.host.HostVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOS;
import com.cloud.storage.VMTemplateHostVO;
import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
@ -136,7 +137,8 @@ public class ListTemplatesCmd extends BaseListCmd {
// get the response
List<VMTemplateVO> templates = (List<VMTemplateVO>)getResponseObject();
List<TemplateResponse> response = new ArrayList<TemplateResponse>();
ListResponse response = new ListResponse();
List<TemplateResponse> templateResponses = new ArrayList<TemplateResponse>();
for (VMTemplateVO template : templates) {
if (!showDomr && template.getId() == TemplateConstants.DEFAULT_SYSTEM_VM_DB_ID) {
@ -222,10 +224,13 @@ public class ListTemplatesCmd extends BaseListCmd {
templateResponse.setJobStatus(asyncJob.getStatus());
}
response.add(templateResponse);
templateResponse.setResponseName("template");
templateResponses.add(templateResponse);
}
}
return SerializerHelper.toSerializedString(response);
response.setResponses(templateResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,8 +27,9 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.UserResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.UserAccountVO;
@Implementation(method="searchForUsers")
@ -100,7 +101,8 @@ public class ListUsersCmd extends BaseListCmd {
public String getResponse() {
List<UserAccountVO> users = (List<UserAccountVO>)getResponseObject();
List<UserResponse> response = new ArrayList<UserResponse>();
ListResponse response = new ListResponse();
List<UserResponse> userResponses = new ArrayList<UserResponse>();
for (UserAccountVO user : users) {
UserResponse userResponse = new UserResponse();
userResponse.setId(user.getId());
@ -118,9 +120,12 @@ public class ListUsersCmd extends BaseListCmd {
userResponse.setApiKey(user.getApiKey());
userResponse.setSecretKey(user.getSecretKey());
response.add(userResponse);
userResponse.setResponseName("user");
userResponses.add(userResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(userResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -27,10 +27,11 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.UserVmResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.VMTemplateVO;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -120,7 +121,8 @@ public class ListVMsCmd extends BaseListCmd {
public String getResponse() {
List<UserVmVO> userVms = (List<UserVmVO>)getResponseObject();
List<UserVmResponse> response = new ArrayList<UserVmResponse>();
ListResponse response = new ListResponse();
List<UserVmResponse> vmResponses = new ArrayList<UserVmResponse>();
for (UserVmVO userVm : userVms) {
UserVmResponse userVmResponse = new UserVmResponse();
userVmResponse.setId(userVm.getId());
@ -217,9 +219,12 @@ public class ListVMsCmd extends BaseListCmd {
//network groups
userVmResponse.setNetworkGroupList(ApiDBUtils.getNetworkGroupsNamesForVm(userVm.getId()));
response.add(userVmResponse);
userVmResponse.setResponseName("virtualmachine");
vmResponses.add(userVmResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(vmResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,11 +26,12 @@ import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.VlanIpRangeResponse;
import com.cloud.dc.HostPodVO;
import com.cloud.dc.Vlan.VlanType;
import com.cloud.dc.VlanVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
@Implementation(method="searchForVlans")
@ -102,7 +103,8 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
public String getResponse() {
List<VlanVO> vlans = (List<VlanVO>)getResponseObject();
List<VlanIpRangeResponse> response = new ArrayList<VlanIpRangeResponse>();
ListResponse response = new ListResponse();
List<VlanIpRangeResponse> vlanResponses = new ArrayList<VlanIpRangeResponse>();
for (VlanVO vlan : vlans) {
Long accountId = ApiDBUtils.getAccountIdForVlan(vlan.getId());
Long podId = ApiDBUtils.getPodIdForVlan(vlan.getId());
@ -130,9 +132,12 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
vlanResponse.setNetmask(vlan.getVlanNetmask());
vlanResponse.setDescription(vlan.getIpRange());
response.add(vlanResponse);
vlanResponse.setResponseName("vlaniprange");
vlanResponses.add(vlanResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(vlanResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -28,10 +28,11 @@ import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.VolumeResponse;
import com.cloud.async.AsyncJobVO;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.DiskOfferingVO;
import com.cloud.storage.VolumeVO;
import com.cloud.user.Account;
@ -127,7 +128,8 @@ public class ListVolumesCmd extends BaseListCmd {
public String getResponse() {
List<VolumeVO> volumes = (List<VolumeVO>)getResponseObject();
List<VolumeResponse> response = new ArrayList<VolumeResponse>();
ListResponse response = new ListResponse();
List<VolumeResponse> volResponses = new ArrayList<VolumeResponse>();
for (VolumeVO volume : volumes) {
VolumeResponse volResponse = new VolumeResponse();
volResponse.setId(volume.getId());
@ -197,9 +199,12 @@ public class ListVolumesCmd extends BaseListCmd {
String poolName = (poolId == null) ? "none" : ApiDBUtils.findStoragePoolById(poolId).getName();
volResponse.setStoragePoolName(poolName);
response.add(volResponse);
volResponse.setResponseName("volume");
volResponses.add(volResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(volResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,9 +26,10 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseListCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ListResponse;
import com.cloud.api.response.ZoneResponse;
import com.cloud.dc.DataCenterVO;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
import com.cloud.user.UserContext;
@ -67,7 +68,8 @@ public class ListZonesByCmd extends BaseListCmd {
List<DataCenterVO> dataCenters = (List<DataCenterVO>)getResponseObject();
Account account = (Account)UserContext.current().getAccountObject();
List<ZoneResponse> response = new ArrayList<ZoneResponse>();
ListResponse response = new ListResponse();
List<ZoneResponse> zoneResponses = new ArrayList<ZoneResponse>();
for (DataCenterVO dataCenter : dataCenters) {
ZoneResponse zoneResponse = new ZoneResponse();
zoneResponse.setId(dataCenter.getId());
@ -86,9 +88,12 @@ public class ListZonesByCmd extends BaseListCmd {
zoneResponse.setGuestCidrAddress(dataCenter.getGuestNetworkCidr());
}
response.add(zoneResponse);
zoneResponse.setResponseName("zone");
zoneResponses.add(zoneResponse);
}
return SerializerHelper.toSerializedString(response);
response.setResponses(zoneResponses);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/QueryAsyncJobResultCmd.java
View File

@ -24,9 +24,9 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.AsyncJobResponse;
import com.cloud.async.AsyncJobResult;
import com.cloud.serializer.SerializerHelper;
public class QueryAsyncJobResultCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(QueryAsyncJobResultCmd.class.getName());
@ -102,7 +102,8 @@ public class QueryAsyncJobResultCmd extends BaseCmd {
}
*/
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
// For now network groups are the only objects with nested objects inside, so we special case serialization to handle this one case.

6
server/src/com/cloud/api/commands/RebootRouterCmd.java
View File

@ -26,8 +26,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="rebootRouter", manager=Manager.NetworkManager)
public class RebootRouterCmd extends BaseAsyncCmd {
@ -67,6 +67,8 @@ public class RebootRouterCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to reboot router");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/RegisterPreallocatedLunCmd.java
View File

@ -20,8 +20,8 @@ package com.cloud.api.commands;
import com.cloud.api.BaseCmd;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.PreallocatedLunResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.preallocatedlun.PreallocatedLunVO;
@Implementation(method="registerPreallocatedLun")
@ -101,6 +101,7 @@ public class RegisterPreallocatedLunCmd extends BaseCmd {
response.setTaken(preallocatedLun.getTaken());
response.setTargetIqn(preallocatedLun.getTargetIqn());
return SerializerHelper.toSerializedString(response);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

5
server/src/com/cloud/api/commands/StartRouterCmd.java
View File

@ -25,8 +25,8 @@ import com.cloud.api.BaseAsyncCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DomainRouterResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.user.Account;
import com.cloud.vm.DomainRouterVO;
@ -104,6 +104,7 @@ public class StartRouterCmd extends BaseAsyncCmd {
routerResponse.setDomainName(ApiDBUtils.findDomainById(accountTemp.getDomainId()).getName());
}
return SerializerHelper.toSerializedString(routerResponse);
routerResponse.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(routerResponse);
}
}

6
server/src/com/cloud/api/commands/StopRouterCmd.java
View File

@ -26,8 +26,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="stopRouter", manager=Manager.NetworkManager)
@ -68,6 +68,8 @@ public class StopRouterCmd extends BaseAsyncCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to stop router");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -22,11 +22,11 @@ import org.apache.log4j.Logger;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.SuccessResponse;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.serializer.SerializerHelper;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
@Implementation(method="updateAccount", manager=Manager.ManagementServer)
public class UpdateAccountCmd extends BaseCmd{
@ -81,6 +81,8 @@ public class UpdateAccountCmd extends BaseCmd{
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update account");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/UpdateCfgCmd.java
View File

@ -25,8 +25,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="updateConfiguration", manager=Manager.ConfigManager)
public class UpdateCfgCmd extends BaseCmd {
@ -73,6 +73,8 @@ public class UpdateCfgCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update config");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

9
server/src/com/cloud/api/commands/UpdateDiskOfferingCmd.java
View File

@ -25,8 +25,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.DiskOfferingResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.DiskOfferingVO;
@Implementation(method="updateDiskOffering", manager=Manager.ConfigManager)
@ -74,7 +74,6 @@ public class UpdateDiskOfferingCmd extends BaseCmd{
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
private DiskOfferingVO responseObject = null;
@Override
public String getName() {
@ -83,6 +82,7 @@ public class UpdateDiskOfferingCmd extends BaseCmd{
public String getResponse() {
DiskOfferingResponse response = new DiskOfferingResponse();
DiskOfferingVO responseObject = (DiskOfferingVO)getResponseObject();
if (responseObject != null) {
response.setId(responseObject.getId());
response.setCreated(responseObject.getCreated());
@ -96,7 +96,8 @@ public class UpdateDiskOfferingCmd extends BaseCmd{
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update disk offering");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/UpdateDomainCmd.java
View File

@ -25,8 +25,8 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.SuccessResponse;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="updateDomain", manager=Manager.ManagementServer)
public class UpdateDomainCmd extends BaseCmd{
@ -74,6 +74,8 @@ public class UpdateDomainCmd extends BaseCmd{
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update domain");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

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

@ -26,22 +26,20 @@ import java.util.Set;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.response.ConfigurationResponse;
import com.cloud.api.response.HostResponse;
import com.cloud.api.ApiDBUtils;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.configuration.ConfigurationVO;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.HostResponse;
import com.cloud.dc.ClusterVO;
import com.cloud.host.Host;
import com.cloud.host.HostStats;
import com.cloud.host.HostVO;
import com.cloud.host.Status.Event;
import com.cloud.offering.ServiceOffering;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.GuestOSCategoryVO;
import com.cloud.vm.UserVmVO;
@ -177,6 +175,8 @@ public class UpdateHostCmd extends BaseCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update host");
}
return SerializerHelper.toSerializedString(host);
hostResponse.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(hostResponse);
}
}

6
server/src/com/cloud/api/commands/UpdateIsoCmd.java
View File

@ -24,8 +24,8 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.TemplateResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.VMTemplateVO;
@Implementation(method="updateTemplate", manager=Manager.ManagementServer)
@ -71,6 +71,8 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update iso");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

6
server/src/com/cloud/api/commands/UpdateTemplateCmd.java
View File

@ -24,8 +24,8 @@ import com.cloud.api.BaseCmd;
import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.TemplateResponse;
import com.cloud.serializer.SerializerHelper;
import com.cloud.storage.VMTemplateVO;
@Implementation(method="updateTemplate", manager=Manager.ManagementServer)
@ -66,6 +66,8 @@ public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd {
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update template");
}
return SerializerHelper.toSerializedString(responseObject);
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

144
server/src/com/cloud/api/commands/UpdateZoneCmd.java
View File

@ -25,9 +25,9 @@ import com.cloud.api.BaseCmd.Manager;
import com.cloud.api.Implementation;
import com.cloud.api.Parameter;
import com.cloud.api.ServerApiException;
import com.cloud.api.response.ApiResponseSerializer;
import com.cloud.api.response.ZoneResponse;
import com.cloud.dc.DataCenterVO;
import com.cloud.serializer.Param;
import com.cloud.serializer.SerializerHelper;
@Implementation(method="updateZone", manager=Manager.ConfigManager)
public class UpdateZoneCmd extends BaseCmd {
@ -102,10 +102,6 @@ public class UpdateZoneCmd extends BaseCmd {
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
private DataCenterVO responseObject = null;
@Override
public String getName() {
@ -113,9 +109,10 @@ public class UpdateZoneCmd extends BaseCmd {
}
@Override
public String getResponse()
{
UpdateZoneResponse response = new UpdateZoneResponse();
public String getResponse() {
ZoneResponse response = new ZoneResponse();
DataCenterVO responseObject = (DataCenterVO)getResponseObject();
if (responseObject != null) {
response.setStatus("true");
response.setDisplayText("Successfully updated zone");
@ -125,132 +122,13 @@ public class UpdateZoneCmd extends BaseCmd {
response.setDns2(responseObject.getDns2());
response.setInternalDns1(responseObject.getInternalDns1());
response.setInternalDns2(responseObject.getInternalDns2());
response.setZoneName(responseObject.getName());
response.setVnet(responseObject.getVnet());
}
else
{
response.setName(responseObject.getName());
response.setVlan(responseObject.getVnet());
} else {
throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to update zone; internal error.");
}
return SerializerHelper.toSerializedString(responseObject);
}
public void setResponseObject(DataCenterVO zone) {
responseObject = zone;
}
// helper class for the response object
private class UpdateZoneResponse
{
@Param(name="status")
private String status;
@Param(name="displaytext")
private String displayText;
@Param(name="dns1")
private String dns1;
@Param(name="dns2")
private String dns2;
@Param(name="guestcidraddress")
private String guestCidrAddress;
@Param(name="id")
private Long id;
@Param(name="internaldns1")
private String internalDns1;
@Param(name="internaldns2")
private String internalDns2;
@Param(name="zonename")
private String zoneName;
@Param(name="vnet")
private String vnet;
public String getGuestCidrAddress() {
return guestCidrAddress;
}
public void setGuestCidrAddress(String guestCidrAddress) {
this.guestCidrAddress = guestCidrAddress;
}
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getInternalDns1() {
return internalDns1;
}
public void setInternalDns1(String internalDns1) {
this.internalDns1 = internalDns1;
}
public String getInternalDns2() {
return internalDns2;
}
public void setInternalDns2(String internalDns2) {
this.internalDns2 = internalDns2;
}
public String getZoneName() {
return zoneName;
}
public void setZoneName(String zoneName) {
this.zoneName = zoneName;
}
public String getVnet() {
return vnet;
}
public void setVnet(String vnet) {
this.vnet = vnet;
}
public String getDns1() {
return dns1;
}
public void setDns1(String dns1) {
this.dns1 = dns1;
}
public String getDns2() {
return dns2;
}
public void setDns2(String dns2) {
this.dns2 = dns2;
}
public String getDisplayText() {
return displayText;
}
public void setDisplayText(String displayText) {
this.displayText = displayText;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
response.setResponseName(getName());
return ApiResponseSerializer.toSerializedString(response);
}
}

17
server/src/com/cloud/api/response/ListResponse.java Normal file
View File

@ -0,0 +1,17 @@
package com.cloud.api.response;
import java.util.List;
import com.cloud.api.ResponseObject;
public class ListResponse extends BaseResponse {
List<? extends ResponseObject> responses;
public List<? extends ResponseObject> getResponses() {
return responses;
}
public void setResponses(List<? extends ResponseObject> responses) {
this.responses = responses;
}
}

22
server/src/com/cloud/api/response/ZoneResponse.java
View File

@ -47,6 +47,12 @@ public class ZoneResponse extends BaseResponse {
@Param(name="guestcidraddress")
private String guestCidrAddress;
@Param(name="status")
private String status;
@Param(name="displaytext")
private String displayText;
public Long getId() {
return id;
}
@ -118,4 +124,20 @@ public class ZoneResponse extends BaseResponse {
public void setGuestCidrAddress(String guestCidrAddress) {
this.guestCidrAddress = guestCidrAddress;
}
public String getStatus() {
return status;
}
public void setStatus(String status) {
this.status = status;
}
public String getDisplayText() {
return displayText;
}
public void setDisplayText(String displayText) {
this.displayText = displayText;
}
}

2
server/src/com/cloud/async/AsyncJobManagerImpl.java
View File

@ -185,7 +185,7 @@ public class AsyncJobManagerImpl implements AsyncJobManager {
job.setProcessStatus(processStatus);
if(resultObject != null)
job.setResult(SerializerHelper.toSerializedString(resultObject));
job.setResult(SerializerHelper.toSerializedStringOld(resultObject));
job.setLastUpdated(DateUtil.currentGMTTime());
_jobDao.update(jobId, job);
txt.commit();