Bump MRI upstreams

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / services / batch / FlatBatchGroupAdaptersTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java
index 4a6126f307da4851e15ef821a2eed12abdea13b1..4a68ba3f4fb3a3e221446c6571e9b7f0702aae26 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchGroupAdaptersTest.java
@@ -5,7 +5,6 @@
  * 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;
@@ -13,16 +12,16 @@ 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;
@@ -41,9 +40,12 @@ 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}.
@@ -60,32 +62,34 @@ public class FlatBatchGroupAdaptersTest {
         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);
         Iterator<BatchAddGroups> iterator = addGroupsBatchInput.nonnullBatchAddGroups().values().iterator();
 
-        Assert.assertTrue(addGroupsBatchInput.isBarrierAfter());
+        Assert.assertTrue(addGroupsBatchInput.getBarrierAfter());
         Assert.assertEquals(2, addGroupsBatchInput.getBatchAddGroups().size());
         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))
@@ -93,6 +97,7 @@ public class FlatBatchGroupAdaptersTest {
                 .setUpdatedBatchedGroup(new UpdatedBatchedGroupBuilder()
                         .setGroupId(new GroupId(groupIdValue))
                         .build())
+                .setBatchOrder(groupIdValue.toUint16())
                 .build();
     }
 
@@ -101,14 +106,14 @@ public class FlatBatchGroupAdaptersTest {
         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);
         Iterator<BatchRemoveGroups> iterator = removeGroupsBatchInput.nonnullBatchRemoveGroups().values().iterator();
 
-        Assert.assertTrue(removeGroupsBatchInput.isBarrierAfter());
+        Assert.assertTrue(removeGroupsBatchInput.getBarrierAfter());
         Assert.assertEquals(2, removeGroupsBatchInput.getBatchRemoveGroups().size());
         Assert.assertEquals(1L, iterator.next().getGroupId().getValue().longValue());
         Assert.assertEquals(2L, iterator.next().getGroupId().getValue().longValue());
@@ -119,13 +124,13 @@ public class FlatBatchGroupAdaptersTest {
         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);
 
-        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());
@@ -136,11 +141,11 @@ public class FlatBatchGroupAdaptersTest {
     @Test
     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();
@@ -173,14 +178,15 @@ public class FlatBatchGroupAdaptersTest {
         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()