* 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.services.batch;
import com.google.common.collect.Lists;
+import java.util.Iterator;
import org.junit.Assert;
import org.junit.Test;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.ProcessFlatBatchOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.group._case.FlatBatchAddGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureGroupIdCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureGroupIdCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.add.group._case.FlatBatchAddGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.remove.group._case.FlatBatchRemoveGroupBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroup;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.group.crud._case.aug.flat.batch.update.group._case.FlatBatchUpdateGroupBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailure;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureGroupIdCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureGroupIdCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.AddGroupsBatchInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.AddGroupsBatchOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.BatchGroupOutputListGrouping;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.RemoveGroupsBatchInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.UpdateGroupsBatchInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.add.groups.batch.input.BatchAddGroups;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.batch.group.input.update.grouping.OriginalBatchedGroupBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.batch.group.input.update.grouping.UpdatedBatchedGroupBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.batch.group.output.list.grouping.BatchFailedGroupsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.batch.group.output.list.grouping.BatchFailedGroupsOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groups.service.rev160315.remove.groups.batch.input.BatchRemoveGroups;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef;
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.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.Uint32;
/**
* Test for {@link FlatBatchGroupAdapters}.
private static final NodeRef NODE_REF = new NodeRef(NODE_II);
@Test
- public void testAdaptFlatBatchAddGroup() throws Exception {
+ public void testAdaptFlatBatchAddGroup() {
final BatchPlanStep planStep = new BatchPlanStep(BatchStepType.FLOW_ADD);
planStep.setBarrierAfter(true);
planStep.getTaskBag().addAll(Lists.newArrayList(
- createAddGroupBatch(1L),
- createAddGroupBatch(2L)));
+ createAddGroupBatch(Uint32.ONE),
+ createAddGroupBatch(Uint32.TWO)));
- final AddGroupsBatchInput addGroupsBatchInput = FlatBatchGroupAdapters.adaptFlatBatchAddGroup(planStep, NODE_REF);
+ final AddGroupsBatchInput addGroupsBatchInput =
+ FlatBatchGroupAdapters.adaptFlatBatchAddGroup(planStep, NODE_REF);
+ Iterator<BatchAddGroups> iterator = addGroupsBatchInput.nonnullBatchAddGroups().values().iterator();
- Assert.assertTrue(addGroupsBatchInput.isBarrierAfter());
+ Assert.assertTrue(addGroupsBatchInput.getBarrierAfter());
Assert.assertEquals(2, addGroupsBatchInput.getBatchAddGroups().size());
- Assert.assertEquals(1L, addGroupsBatchInput.getBatchAddGroups().get(0).getGroupId().getValue().longValue());
- Assert.assertEquals(2L, addGroupsBatchInput.getBatchAddGroups().get(1).getGroupId().getValue().longValue());
+ Assert.assertEquals(1L, iterator.next().getGroupId().getValue().longValue());
+ Assert.assertEquals(2L, iterator.next().getGroupId().getValue().longValue());
}
- private FlatBatchAddGroup createAddGroupBatch(final long groupIdValue) {
+ private static FlatBatchAddGroup createAddGroupBatch(final Uint32 groupIdValue) {
return new FlatBatchAddGroupBuilder()
.setGroupId(new GroupId(groupIdValue))
+ .setBatchOrder(groupIdValue.toUint16())
.build();
}
- private FlatBatchRemoveGroup createRemoveGroupBatch(final long groupIdValue) {
+ private static FlatBatchRemoveGroup createRemoveGroupBatch(final Uint32 groupIdValue) {
return new FlatBatchRemoveGroupBuilder()
.setGroupId(new GroupId(groupIdValue))
+ .setBatchOrder(groupIdValue.toUint16())
.build();
}
- private FlatBatchUpdateGroup createUpdateGroupBatch(final long groupIdValue) {
+ private static FlatBatchUpdateGroup createUpdateGroupBatch(final Uint32 groupIdValue) {
return new FlatBatchUpdateGroupBuilder()
.setOriginalBatchedGroup(new OriginalBatchedGroupBuilder()
.setGroupId(new GroupId(groupIdValue))
.setUpdatedBatchedGroup(new UpdatedBatchedGroupBuilder()
.setGroupId(new GroupId(groupIdValue))
.build())
+ .setBatchOrder(groupIdValue.toUint16())
.build();
}
@Test
- public void testAdaptFlatBatchRemoveGroup() throws Exception {
+ public void testAdaptFlatBatchRemoveGroup() {
final BatchPlanStep planStep = new BatchPlanStep(BatchStepType.FLOW_REMOVE);
planStep.setBarrierAfter(true);
planStep.getTaskBag().addAll(Lists.newArrayList(
- createRemoveGroupBatch(1L),
- createRemoveGroupBatch(2L)));
+ createRemoveGroupBatch(Uint32.ONE),
+ createRemoveGroupBatch(Uint32.TWO)));
- final RemoveGroupsBatchInput removeGroupsBatchInput = FlatBatchGroupAdapters.adaptFlatBatchRemoveGroup(planStep, NODE_REF);
+ final RemoveGroupsBatchInput removeGroupsBatchInput =
+ FlatBatchGroupAdapters.adaptFlatBatchRemoveGroup(planStep, NODE_REF);
+ Iterator<BatchRemoveGroups> iterator = removeGroupsBatchInput.nonnullBatchRemoveGroups().values().iterator();
- Assert.assertTrue(removeGroupsBatchInput.isBarrierAfter());
+ Assert.assertTrue(removeGroupsBatchInput.getBarrierAfter());
Assert.assertEquals(2, removeGroupsBatchInput.getBatchRemoveGroups().size());
- Assert.assertEquals(1L, removeGroupsBatchInput.getBatchRemoveGroups().get(0).getGroupId().getValue().longValue());
- Assert.assertEquals(2L, removeGroupsBatchInput.getBatchRemoveGroups().get(1).getGroupId().getValue().longValue());
+ Assert.assertEquals(1L, iterator.next().getGroupId().getValue().longValue());
+ Assert.assertEquals(2L, iterator.next().getGroupId().getValue().longValue());
}
@Test
- public void testAdaptFlatBatchUpdateGroup() throws Exception {
+ public void testAdaptFlatBatchUpdateGroup() {
final BatchPlanStep planStep = new BatchPlanStep(BatchStepType.FLOW_UPDATE);
planStep.setBarrierAfter(true);
planStep.getTaskBag().addAll(Lists.newArrayList(
- createUpdateGroupBatch(1L),
- createUpdateGroupBatch(2L)));
+ createUpdateGroupBatch(Uint32.ONE),
+ createUpdateGroupBatch(Uint32.TWO)));
- final UpdateGroupsBatchInput updateGroupsBatchInput = FlatBatchGroupAdapters.adaptFlatBatchUpdateGroup(planStep, NODE_REF);
+ final UpdateGroupsBatchInput updateGroupsBatchInput =
+ FlatBatchGroupAdapters.adaptFlatBatchUpdateGroup(planStep, NODE_REF);
- Assert.assertTrue(updateGroupsBatchInput.isBarrierAfter());
+ Assert.assertTrue(updateGroupsBatchInput.getBarrierAfter());
Assert.assertEquals(2, updateGroupsBatchInput.getBatchUpdateGroups().size());
- Assert.assertEquals(1L, updateGroupsBatchInput.getBatchUpdateGroups().get(0).getUpdatedBatchedGroup().getGroupId().getValue().longValue());
- Assert.assertEquals(2L, updateGroupsBatchInput.getBatchUpdateGroups().get(1).getUpdatedBatchedGroup().getGroupId().getValue().longValue());
+ Assert.assertEquals(1L, updateGroupsBatchInput.getBatchUpdateGroups().get(0)
+ .getUpdatedBatchedGroup().getGroupId().getValue().longValue());
+ Assert.assertEquals(2L, updateGroupsBatchInput.getBatchUpdateGroups().get(1)
+ .getUpdatedBatchedGroup().getGroupId().getValue().longValue());
}
@Test
- public void testCreateBatchGroupChainingFunction_failures() throws Exception {
+ public void testCreateBatchGroupChainingFunction_failures() {
final RpcResult<BatchGroupOutputListGrouping> input = RpcResultBuilder.<BatchGroupOutputListGrouping>failed()
- .withError(RpcError.ErrorType.APPLICATION, "ut-groupError")
+ .withError(ErrorType.APPLICATION, "ut-groupError")
.withResult(new AddGroupsBatchOutputBuilder()
- .setBatchFailedGroupsOutput(Lists.newArrayList(
- createBatchFailedGroupsOutput(0, 1L),
- createBatchFailedGroupsOutput(1, 2L)
+ .setBatchFailedGroupsOutput(BindingMap.ordered(
+ createBatchFailedGroupsOutput(Uint16.ZERO, Uint32.ONE),
+ createBatchFailedGroupsOutput(Uint16.ONE, Uint32.TWO)
))
.build())
.build();
final RpcResult<ProcessFlatBatchOutput> rpcResult = FlatBatchGroupAdapters
.convertBatchGroupResult(3).apply(input);
+ Iterator<BatchFailure> iterator = rpcResult.getResult().nonnullBatchFailure().values().iterator();
Assert.assertFalse(rpcResult.isSuccessful());
Assert.assertEquals(1, rpcResult.getErrors().size());
- Assert.assertEquals(2, rpcResult.getResult().getBatchFailure().size());
- Assert.assertEquals(3, rpcResult.getResult().getBatchFailure().get(0).getBatchOrder().intValue());
- Assert.assertEquals(4, rpcResult.getResult().getBatchFailure().get(1).getBatchOrder().intValue());
- Assert.assertEquals(2L, ((FlatBatchFailureGroupIdCase) rpcResult.getResult().getBatchFailure().get(1).getBatchItemIdChoice()).getGroupId().getValue().longValue());
+ Assert.assertEquals(2, rpcResult.getResult().nonnullBatchFailure().size());
+ Assert.assertEquals(3, iterator.next().getBatchOrder().intValue());
+ BatchFailure secondBatchFailure = iterator.next();
+ Assert.assertEquals(4, secondBatchFailure.getBatchOrder().intValue());
+ Assert.assertEquals(2L, ((FlatBatchFailureGroupIdCase) secondBatchFailure
+ .getBatchItemIdChoice()).getGroupId().getValue().longValue());
}
@Test
- public void testCreateBatchGroupChainingFunction_successes() throws Exception {
+ public void testCreateBatchGroupChainingFunction_successes() {
final RpcResult<BatchGroupOutputListGrouping> input = RpcResultBuilder
.<BatchGroupOutputListGrouping>success(new AddGroupsBatchOutputBuilder().build())
.build();
Assert.assertTrue(rpcResult.isSuccessful());
Assert.assertEquals(0, rpcResult.getErrors().size());
- Assert.assertEquals(0, rpcResult.getResult().getBatchFailure().size());
+ Assert.assertEquals(0, rpcResult.getResult().nonnullBatchFailure().size());
}
- private BatchFailedGroupsOutput createBatchFailedGroupsOutput(final Integer batchOrder, final long groupIdValue) {
+ private static BatchFailedGroupsOutput createBatchFailedGroupsOutput(final Uint16 batchOrder,
+ final Uint32 groupIdValue) {
return new BatchFailedGroupsOutputBuilder()
.setGroupId(new GroupId(groupIdValue))
.setBatchOrder(batchOrder)
.build();
}
- private BatchFailure createChainFailure(final int batchOrder, final long groupIdValue) {
+ private static BatchFailure createChainFailure(final Uint16 batchOrder, final Uint32 groupIdValue) {
return new BatchFailureBuilder()
.setBatchOrder(batchOrder)
.setBatchItemIdChoice(new FlatBatchFailureGroupIdCaseBuilder()