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

CS-15617. Changed CounterResponse to a List as queryAsyncJob expects it. 

reviewed by: Nitin
This commit is contained in:
Deepak Garg 2012-08-17 14:34:21 +05:30
parent dbffdef308
commit ad6ac9b449
2 changed files with 9 additions and 7 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;
import java.util.List;
import com.cloud.api.ApiConstants;
import com.cloud.serializer.Param;
import com.cloud.utils.IdentityProxy;
@ -38,7 +40,7 @@ public class ConditionResponse extends BaseResponse implements ControlledEntityR
@SerializedName("counter")
@Param(description = "Details of the Counter.")
private CounterResponse counter;
private List<CounterResponse> counterResponse;
@SerializedName(ApiConstants.DOMAIN_ID)
@Param(description = "the domain id of the Condition owner")
@ -80,8 +82,8 @@ public class ConditionResponse extends BaseResponse implements ControlledEntityR
this.relationalOperator = relationalOperator;
}
public void setCounter(CounterResponse counter) {
this.counter = counter;
public void setCounterResponse(List<CounterResponse> counterResponse) {
this.counterResponse = counterResponse;
}
@Override

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

@ -4020,13 +4020,13 @@ public class ApiResponseHelper implements ResponseGenerator {
public ConditionResponse createConditionResponse(Condition condition) {
ConditionResponse response = new ConditionResponse();
response.setId(condition.getId());
CounterResponse counter;
counter = createCounterResponse(ApiDBUtils.getCounter(condition.getCounterid()));
response.setCounter(counter);
List<CounterResponse> counterResponseList = new ArrayList<CounterResponse>();
counterResponseList.add(createCounterResponse(ApiDBUtils.getCounter(condition.getCounterid())));
response.setCounterResponse(counterResponseList);
response.setRelationalOperator(condition.getRelationalOperator().toString());
response.setThreshold(condition.getThreshold());
response.setObjectName("condition");
populateOwner(response, condition);
return response;
}
}
}