diff --git a/api/src/com/cloud/api/response/ConditionResponse.java b/api/src/com/cloud/api/response/ConditionResponse.java index d2922d6c648..636c9275e62 100644 --- a/api/src/com/cloud/api/response/ConditionResponse.java +++ b/api/src/com/cloud/api/response/ConditionResponse.java @@ -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; @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) { + this.counterResponse = counterResponse; } @Override diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 11b8c859686..a6a3ccc6e52 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -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 counterResponseList = new ArrayList(); + 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; } -} +}