* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.impl.util;
-import com.google.common.base.Function;
import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.Assert;
import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev150304.SendBarrierOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.AddFlowsBatchOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.BatchFlowOutputListGrouping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flows.service.rev160314.batch.flow.output.list.grouping.BatchFailedFlowsOutputKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yangtools.yang.common.RpcError;
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;
public class FlowUtilTest {
public static final NodeId DUMMY_NODE_ID = new NodeId("dummyNodeId");
public static final FlowId DUMMY_FLOW_ID = new FlowId("dummyFlowId");
public static final FlowId DUMMY_FLOW_ID_2 = new FlowId("dummyFlowId_2");
- public static final Short DUMMY_TABLE_ID = 1;
+ public static final Uint8 DUMMY_TABLE_ID = Uint8.ONE;
@Test
- public void testBuildFlowPath() throws Exception {
+ public void testBuildFlowPath() {
final InstanceIdentifier<Node> nodePath = InstanceIdentifier
.create(Nodes.class)
.child(Node.class, new NodeKey(DUMMY_NODE_ID));
}
@Test
- public void testCreateCumulatingFunction() throws Exception {
+ public void testCreateCumulatingFunction() {
final Function<List<RpcResult<String>>, RpcResult<List<BatchFailedFlowsOutput>>> function =
FlowUtil.createCumulatingFunction(Lists.newArrayList(createBatchFlowIdGrouping(DUMMY_FLOW_ID),
createBatchFlowIdGrouping(DUMMY_FLOW_ID_2)));
}
@Test
- public void testFlowAddTransformFailure() throws Exception {
+ public void testFlowAddTransformFailure() {
final RpcResult<List<BatchFailedFlowsOutput>> input = createBatchOutcomeWithError();
checkBatchErrorOutcomeTransformation(FlowUtil.FLOW_ADD_TRANSFORM.apply(input));
}
@Test
- public void testFlowAddTransformSuccess() throws Exception {
+ public void testFlowAddTransformSuccess() {
final RpcResult<List<BatchFailedFlowsOutput>> input = createEmptyBatchOutcome();
checkBatchSuccessOutcomeTransformation(FlowUtil.FLOW_ADD_TRANSFORM.apply(input));
}
@Test
- public void testFlowRemoveTransformFailure() throws Exception {
+ public void testFlowRemoveTransformFailure() {
final RpcResult<List<BatchFailedFlowsOutput>> input = createBatchOutcomeWithError();
checkBatchErrorOutcomeTransformation(FlowUtil.FLOW_REMOVE_TRANSFORM.apply(input));
}
@Test
- public void testFlowRemoveTransformSuccess() throws Exception {
+ public void testFlowRemoveTransformSuccess() {
final RpcResult<List<BatchFailedFlowsOutput>> input = createEmptyBatchOutcome();
checkBatchSuccessOutcomeTransformation(FlowUtil.FLOW_REMOVE_TRANSFORM.apply(input));
}
@Test
- public void testFlowUpdateTransformFailure() throws Exception {
+ public void testFlowUpdateTransformFailure() {
final RpcResult<List<BatchFailedFlowsOutput>> input = createBatchOutcomeWithError();
checkBatchErrorOutcomeTransformation(FlowUtil.FLOW_UPDATE_TRANSFORM.apply(input));
}
@Test
- public void testFlowUpdateTransformSuccess() throws Exception {
+ public void testFlowUpdateTransformSuccess() {
final RpcResult<List<BatchFailedFlowsOutput>> input = createEmptyBatchOutcome();
checkBatchSuccessOutcomeTransformation(FlowUtil.FLOW_UPDATE_TRANSFORM.apply(input));
}
- private <T extends BatchFlowOutputListGrouping> void checkBatchSuccessOutcomeTransformation(
+ private static <T extends BatchFlowOutputListGrouping> void checkBatchSuccessOutcomeTransformation(
final RpcResult<T> output) {
Assert.assertTrue(output.isSuccessful());
- Assert.assertEquals(0, output.getResult().getBatchFailedFlowsOutput().size());
+ Map<BatchFailedFlowsOutputKey, BatchFailedFlowsOutput> failedFlows
+ = output.getResult().nonnullBatchFailedFlowsOutput();
+ Assert.assertEquals(0, failedFlows.size());
Assert.assertEquals(0, output.getErrors().size());
}
- private RpcResult<List<BatchFailedFlowsOutput>> createEmptyBatchOutcome() {
+ private static RpcResult<List<BatchFailedFlowsOutput>> createEmptyBatchOutcome() {
return RpcResultBuilder
- .<List<BatchFailedFlowsOutput>>success(Collections.<BatchFailedFlowsOutput>emptyList())
+ .success(Collections.<BatchFailedFlowsOutput>emptyList())
.build();
}
- private RpcResult<List<BatchFailedFlowsOutput>> createBatchOutcomeWithError() {
+ private static RpcResult<List<BatchFailedFlowsOutput>> createBatchOutcomeWithError() {
return RpcResultBuilder.<List<BatchFailedFlowsOutput>>failed()
.withError(RpcError.ErrorType.APPLICATION, "ut-flowAddFail")
.withResult(Collections.singletonList(new BatchFailedFlowsOutputBuilder()
.setFlowId(DUMMY_FLOW_ID)
+ .setBatchOrder(Uint16.ZERO)
.build()))
.build();
}
- private <T extends BatchFlowOutputListGrouping> void checkBatchErrorOutcomeTransformation(
+ private static <T extends BatchFlowOutputListGrouping> void checkBatchErrorOutcomeTransformation(
final RpcResult<T> output) {
Assert.assertFalse(output.isSuccessful());
- Assert.assertEquals(1, output.getResult().getBatchFailedFlowsOutput().size());
- Assert.assertEquals(DUMMY_FLOW_ID, output.getResult().getBatchFailedFlowsOutput().get(0).getFlowId());
+ Assert.assertEquals(1, output.getResult().nonnullBatchFailedFlowsOutput().size());
+ Assert.assertEquals(DUMMY_FLOW_ID,
+ output.getResult().nonnullBatchFailedFlowsOutput().values().iterator().next().getFlowId());
Assert.assertEquals(1, output.getErrors().size());
}
@Test
- public void testCreateComposingFunction_success_success() throws Exception {
- final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>>, RpcResult<AddFlowsBatchOutput>>
- compositeFunction = FlowUtil.createComposingFunction();
+ public void testCreateComposingFunction_success_success() {
+ final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>>,
+ RpcResult<AddFlowsBatchOutput>> compositeFunction = FlowUtil.createComposingFunction();
final RpcResult<AddFlowsBatchOutput> addFlowBatchOutput = createAddFlowsBatchSuccessOutput();
- final RpcResult<Void> barrierOutput = RpcResultBuilder.<Void>success().build();
- final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>> input = Pair.of(addFlowBatchOutput, barrierOutput);
+ final RpcResult<SendBarrierOutput> barrierOutput = RpcResultBuilder.<SendBarrierOutput>success().build();
+ final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>> input
+ = Pair.of(addFlowBatchOutput, barrierOutput);
final RpcResult<AddFlowsBatchOutput> composite = compositeFunction.apply(input);
Assert.assertTrue(composite.isSuccessful());
Assert.assertEquals(0, composite.getErrors().size());
- Assert.assertEquals(0, composite.getResult().getBatchFailedFlowsOutput().size());
+ Map<BatchFailedFlowsOutputKey, BatchFailedFlowsOutput> failedFlows
+ = composite.getResult().nonnullBatchFailedFlowsOutput();
+ Assert.assertEquals(0, failedFlows.size());
}
@Test
- public void testCreateComposingFunction_failure_success() throws Exception {
- final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>>, RpcResult<AddFlowsBatchOutput>>
- compositeFunction = FlowUtil.createComposingFunction();
+ public void testCreateComposingFunction_failure_success() {
+ final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>>,
+ RpcResult<AddFlowsBatchOutput>> compositeFunction = FlowUtil.createComposingFunction();
final RpcResult<AddFlowsBatchOutput> addFlowBatchOutput = createAddFlowsBatchFailureOutcome();
- final RpcResult<Void> barrierOutput = RpcResultBuilder.<Void>success().build();
- final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>> input = Pair.of(addFlowBatchOutput, barrierOutput);
+ final RpcResult<SendBarrierOutput> barrierOutput = RpcResultBuilder.<SendBarrierOutput>success().build();
+ final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>> input
+ = Pair.of(addFlowBatchOutput, barrierOutput);
final RpcResult<AddFlowsBatchOutput> composite = compositeFunction.apply(input);
Assert.assertFalse(composite.isSuccessful());
}
@Test
- public void testCreateComposingFunction_success_failure() throws Exception {
- final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>>, RpcResult<AddFlowsBatchOutput>>
- compositeFunction = FlowUtil.createComposingFunction();
+ public void testCreateComposingFunction_success_failure() {
+ final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>>,
+ RpcResult<AddFlowsBatchOutput>> compositeFunction = FlowUtil.createComposingFunction();
final RpcResult<AddFlowsBatchOutput> addFlowBatchOutput = createAddFlowsBatchSuccessOutput();
- final RpcResult<Void> barrierOutput = createBarrierFailureOutcome();
- final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>> input = Pair.of(addFlowBatchOutput, barrierOutput);
+ final RpcResult<SendBarrierOutput> barrierOutput = createBarrierFailureOutcome();
+ final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>> input
+ = Pair.of(addFlowBatchOutput, barrierOutput);
final RpcResult<AddFlowsBatchOutput> composite = compositeFunction.apply(input);
Assert.assertFalse(composite.isSuccessful());
Assert.assertEquals(1, composite.getErrors().size());
- Assert.assertEquals(0, composite.getResult().getBatchFailedFlowsOutput().size());
+ Map<BatchFailedFlowsOutputKey, BatchFailedFlowsOutput> failedFlows
+ = composite.getResult().nonnullBatchFailedFlowsOutput();
+ Assert.assertEquals(0, failedFlows.size());
}
@Test
- public void testCreateComposingFunction_failure_failure() throws Exception {
- final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>>, RpcResult<AddFlowsBatchOutput>>
- compositeFunction = FlowUtil.createComposingFunction();
+ public void testCreateComposingFunction_failure_failure() {
+ final Function<Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>>,
+ RpcResult<AddFlowsBatchOutput>> compositeFunction = FlowUtil.createComposingFunction();
final RpcResult<AddFlowsBatchOutput> addFlowBatchOutput = createAddFlowsBatchFailureOutcome();
- final RpcResult<Void> barrierOutput = createBarrierFailureOutcome();
- final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<Void>> input = Pair.of(addFlowBatchOutput, barrierOutput);
+ final RpcResult<SendBarrierOutput> barrierOutput = createBarrierFailureOutcome();
+ final Pair<RpcResult<AddFlowsBatchOutput>, RpcResult<SendBarrierOutput>> input
+ = Pair.of(addFlowBatchOutput, barrierOutput);
final RpcResult<AddFlowsBatchOutput> composite = compositeFunction.apply(input);
Assert.assertFalse(composite.isSuccessful());
Assert.assertEquals(1, composite.getResult().getBatchFailedFlowsOutput().size());
}
- private RpcResult<Void> createBarrierFailureOutcome() {
- return RpcResultBuilder.<Void>failed()
+ private static RpcResult<SendBarrierOutput> createBarrierFailureOutcome() {
+ return RpcResultBuilder.<SendBarrierOutput>failed()
.withError(RpcError.ErrorType.APPLICATION, "ut-barrier-error")
.build();
}
- private RpcResult<AddFlowsBatchOutput> createAddFlowsBatchSuccessOutput() {
+ private static RpcResult<AddFlowsBatchOutput> createAddFlowsBatchSuccessOutput() {
return RpcResultBuilder
.success(new AddFlowsBatchOutputBuilder()
- .setBatchFailedFlowsOutput(Collections.<BatchFailedFlowsOutput>emptyList())
+ .setBatchFailedFlowsOutput(Collections.emptyList())
.build())
.build();
}
- private RpcResult<AddFlowsBatchOutput> createAddFlowsBatchFailureOutcome() {
+ private static RpcResult<AddFlowsBatchOutput> createAddFlowsBatchFailureOutcome() {
final RpcResult<List<BatchFailedFlowsOutput>> batchOutcomeWithError = createBatchOutcomeWithError();
return RpcResultBuilder.<AddFlowsBatchOutput>failed()
.withResult(new AddFlowsBatchOutputBuilder()