mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Autoscale:Sending the Counter params as list
Conflicts: server/src/com/cloud/api/ApiResponseHelper.java
This commit is contained in:
parent
8d5c78e3d4
commit
aea87da410
@ -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
|
||||
|
||||
@ -3841,9 +3841,9 @@ 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");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user