apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Autoscale:Sending the Counter params as list

Browse Source 
Conflicts:

	server/src/com/cloud/api/ApiResponseHelper.java
This commit is contained in:
Vijay Venkatachalam 2012-11-14 15:33:38 +05:30
parent 8d5c78e3d4
commit aea87da410
2 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/com/cloud/api/response/ConditionResponse.java
View File

@ -17,6 +17,8 @@
package com.cloud.api.response; package com.cloud.api.response;
import java.util.List;
import com.cloud.api.ApiConstants; import com.cloud.api.ApiConstants;
import com.cloud.serializer.Param; import com.cloud.serializer.Param;
import com.cloud.utils.IdentityProxy; import com.cloud.utils.IdentityProxy;
@ -38,7 +40,7 @@ public class ConditionResponse extends BaseResponse implements ControlledEntityR
@SerializedName("counter") @SerializedName("counter")
@Param(description = "Details of the Counter.") @Param(description = "Details of the Counter.")
private CounterResponse counter; private List<CounterResponse> counterResponse;
@SerializedName(ApiConstants.DOMAIN_ID) @SerializedName(ApiConstants.DOMAIN_ID)
@Param(description = "the domain id of the Condition owner") @Param(description = "the domain id of the Condition owner")
@ -80,8 +82,8 @@ public class ConditionResponse extends BaseResponse implements ControlledEntityR
this.relationalOperator = relationalOperator; this.relationalOperator = relationalOperator;
} }
public void setCounter(CounterResponse counter) { public void setCounterResponse(List<CounterResponse> counterResponse) {
this.counter = counter; this.counterResponse = counterResponse;
} }
@Override @Override

80
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -1071,28 +1071,28 @@ public class ApiResponseHelper implements ResponseGenerator {
volResponse.setVolumeType(volume.getVolumeType().toString()); volResponse.setVolumeType(volume.getVolumeType().toString());
volResponse.setDeviceId(volume.getDeviceId()); volResponse.setDeviceId(volume.getDeviceId());
Long instanceId = volume.getInstanceId(); Long instanceId = volume.getInstanceId();
if (instanceId != null && volume.getState() != Volume.State.Destroy) { if (instanceId != null && volume.getState() != Volume.State.Destroy) {
VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId); VMInstanceVO vm = ApiDBUtils.findVMInstanceById(instanceId);
if (vm != null) { if (vm != null) {
volResponse.setVirtualMachineId(vm.getId()); volResponse.setVirtualMachineId(vm.getId());
volResponse.setVirtualMachineName(vm.getHostName()); volResponse.setVirtualMachineName(vm.getHostName());
UserVm userVm = ApiDBUtils.findUserVmById(vm.getId()); UserVm userVm = ApiDBUtils.findUserVmById(vm.getId());
if (userVm != null) { if (userVm != null) {
if (userVm.getDisplayName() != null) { if (userVm.getDisplayName() != null) {
volResponse.setVirtualMachineDisplayName(userVm.getDisplayName()); volResponse.setVirtualMachineDisplayName(userVm.getDisplayName());
} else { } else {
volResponse.setVirtualMachineDisplayName(userVm.getHostName()); volResponse.setVirtualMachineDisplayName(userVm.getHostName());
} }
volResponse.setVirtualMachineState(vm.getState().toString()); volResponse.setVirtualMachineState(vm.getState().toString());
} else { } else {
s_logger.error("User Vm with Id: " + instanceId + " does not exist for volume " + volume.getId()); s_logger.error("User Vm with Id: " + instanceId + " does not exist for volume " + volume.getId());
} }
} else { } else {
s_logger.error("Vm with Id: " + instanceId + " does not exist for volume " + volume.getId()); s_logger.error("Vm with Id: " + instanceId + " does not exist for volume " + volume.getId());
} }
} }
// Show the virtual size of the volume // Show the virtual size of the volume
volResponse.setSize(volume.getSize()); volResponse.setSize(volume.getSize());
@ -1166,22 +1166,22 @@ public class ApiResponseHelper implements ResponseGenerator {
volResponse.setAttached(volume.getAttached()); volResponse.setAttached(volume.getAttached());
volResponse.setDestroyed(volume.getState() == Volume.State.Destroy); volResponse.setDestroyed(volume.getState() == Volume.State.Destroy);
boolean isExtractable = true; boolean isExtractable = true;
if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk dont have any template dependence. if (volume.getVolumeType() != Volume.Type.DATADISK) { // Datadisk dont have any template dependence.
VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId()); VMTemplateVO template = ApiDBUtils.findTemplateById(volume.getTemplateId());
if (template != null) { // For ISO based volumes template = null and we allow extraction of all ISO based volumes if (template != null) { // For ISO based volumes template = null and we allow extraction of all ISO based volumes
isExtractable = template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM; isExtractable = template.isExtractable() && template.getTemplateType() != Storage.TemplateType.SYSTEM;
} }
} }
//set tag information //set tag information
List<? extends ResourceTag> tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Volume, volume.getId()); List<? extends ResourceTag> tags = ApiDBUtils.listByResourceTypeAndId(TaggedResourceType.Volume, volume.getId());
List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>(); List<ResourceTagResponse> tagResponses = new ArrayList<ResourceTagResponse>();
for (ResourceTag tag : tags) { for (ResourceTag tag : tags) {
ResourceTagResponse tagResponse = createResourceTagResponse(tag, true); ResourceTagResponse tagResponse = createResourceTagResponse(tag, true);
tagResponses.add(tagResponse); tagResponses.add(tagResponse);
} }
volResponse.setTags(tagResponses); volResponse.setTags(tagResponses);
volResponse.setExtractable(isExtractable); volResponse.setExtractable(isExtractable);
volResponse.setObjectName("volume"); volResponse.setObjectName("volume");
@ -3841,9 +3841,9 @@ public class ApiResponseHelper implements ResponseGenerator {
public ConditionResponse createConditionResponse(Condition condition) { public ConditionResponse createConditionResponse(Condition condition) {
ConditionResponse response = new ConditionResponse(); ConditionResponse response = new ConditionResponse();
response.setId(condition.getId()); response.setId(condition.getId());
CounterResponse counter; List<CounterResponse> counterResponseList = new ArrayList<CounterResponse>();
counter = createCounterResponse(ApiDBUtils.getCounter(condition.getCounterid())); counterResponseList.add(createCounterResponse(ApiDBUtils.getCounter(condition.getCounterid())));
response.setCounter(counter); response.setCounterResponse(counterResponseList);
response.setRelationalOperator(condition.getRelationalOperator().toString()); response.setRelationalOperator(condition.getRelationalOperator().toString());
response.setThreshold(condition.getThreshold()); response.setThreshold(condition.getThreshold());
response.setObjectName("condition"); response.setObjectName("condition");