package org.opendaylight.openflowplugin.impl.services.sal;
-import com.google.common.collect.Lists;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.Future;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcError;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.ErrorType;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint8;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
final RemoveFlowsBatchInput input = new RemoveFlowsBatchInputBuilder()
.setNode(NODE_REF)
.setBarrierAfter(true)
- .setBatchRemoveFlows(Lists.newArrayList(batchFlow1, batchFlow2))
+ .setBatchRemoveFlows(BindingMap.ordered(batchFlow1, batchFlow2))
.build();
final Future<RpcResult<RemoveFlowsBatchOutput>> resultFuture = salFlowsBatchService.removeFlowsBatch(input);
public void testRemoveFlowsBatch_failed() throws Exception {
Mockito.when(salFlowService.removeFlow(ArgumentMatchers.any()))
.thenReturn(RpcResultBuilder.<RemoveFlowOutput>failed()
- .withError(RpcError.ErrorType.APPLICATION, "flow-remove-fail-1")
+ .withError(ErrorType.APPLICATION, "flow-remove-fail-1")
.buildFuture());
final BatchRemoveFlows batchFlow1 = createEmptyBatchRemoveFlow(FLOW_ID_VALUE_1, 42);
final RemoveFlowsBatchInput input = new RemoveFlowsBatchInputBuilder()
.setNode(NODE_REF)
.setBarrierAfter(true)
- .setBatchRemoveFlows(Lists.newArrayList(batchFlow1, batchFlow2))
+ .setBatchRemoveFlows(BindingMap.ordered(batchFlow1, batchFlow2))
.build();
final Future<RpcResult<RemoveFlowsBatchOutput>> resultFuture = salFlowsBatchService.removeFlowsBatch(input);
private static BatchAddFlows createEmptyBatchAddFlow(final String flowIdValue, final int priority) {
return new BatchAddFlowsBuilder()
.setFlowId(new FlowId(flowIdValue))
- .setPriority(priority)
+ .setPriority(Uint16.valueOf(priority))
.setMatch(new MatchBuilder().build())
- .setTableId((short) 0)
+ .setTableId(Uint8.ZERO)
.build();
}
private static BatchRemoveFlows createEmptyBatchRemoveFlow(final String flowIdValue, final int priority) {
return new BatchRemoveFlowsBuilder()
.setFlowId(new FlowId(flowIdValue))
- .setPriority(priority)
+ .setPriority(Uint16.valueOf(priority))
.setMatch(new MatchBuilder().build())
- .setTableId((short) 0)
+ .setTableId(Uint8.ZERO)
.build();
}
final AddFlowsBatchInput input = new AddFlowsBatchInputBuilder()
.setNode(NODE_REF)
.setBarrierAfter(true)
- .setBatchAddFlows(Lists.newArrayList(
+ .setBatchAddFlows(BindingMap.ordered(
createEmptyBatchAddFlow("ut-dummy-flow1", 42),
createEmptyBatchAddFlow("ut-dummy-flow2", 43)))
.build();
public void testAddFlowsBatch_failed() throws Exception {
Mockito.when(salFlowService.addFlow(ArgumentMatchers.any()))
.thenReturn(RpcResultBuilder
- .<AddFlowOutput>failed().withError(RpcError.ErrorType.APPLICATION, "ut-groupAddError")
+ .<AddFlowOutput>failed().withError(ErrorType.APPLICATION, "ut-groupAddError")
.buildFuture());
final AddFlowsBatchInput input = new AddFlowsBatchInputBuilder()
.setNode(NODE_REF)
.setBarrierAfter(true)
- .setBatchAddFlows(Lists.newArrayList(
+ .setBatchAddFlows(BindingMap.ordered(
createEmptyBatchAddFlow(FLOW_ID_VALUE_1, 42),
createEmptyBatchAddFlow(FLOW_ID_VALUE_2, 43)))
.build();
final UpdateFlowsBatchInput input = new UpdateFlowsBatchInputBuilder()
.setNode(NODE_REF)
.setBarrierAfter(true)
- .setBatchUpdateFlows(Lists.newArrayList(
+ .setBatchUpdateFlows(BindingMap.ordered(
createEmptyBatchUpdateFlow(FLOW_ID_VALUE_1, 42),
createEmptyBatchUpdateFlow(FLOW_ID_VALUE_2, 44)))
.build();
public void testUpdateFlowsBatch_failure() throws Exception {
Mockito.when(salFlowService.updateFlow(ArgumentMatchers.any()))
.thenReturn(RpcResultBuilder.<UpdateFlowOutput>failed()
- .withError(RpcError.ErrorType.APPLICATION, "ut-flowUpdateError")
+ .withError(ErrorType.APPLICATION, "ut-flowUpdateError")
.buildFuture());
final UpdateFlowsBatchInput input = new UpdateFlowsBatchInputBuilder()
.setNode(NODE_REF)
.setBarrierAfter(true)
- .setBatchUpdateFlows(Lists.newArrayList(
+ .setBatchUpdateFlows(BindingMap.ordered(
createEmptyBatchUpdateFlow(FLOW_ID_VALUE_1, 42),
createEmptyBatchUpdateFlow(FLOW_ID_VALUE_2, 44)))
.build();