Bump MRI upstreams

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

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java
index a7b34ee6508d80f6f547c143d90a17dd25cd021e..d20702aecf6c6f7caa63235122e6d02859e02ad5 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/batch/FlatBatchMeterAdaptersTest.java
@@ -12,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.meter._case.FlatBatchAddMeter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.add.meter._case.FlatBatchAddMeterBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeter;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.input.batch.batch.choice.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureMeterIdCase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.failure.ids.aug.FlatBatchFailureMeterIdCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.add.meter._case.FlatBatchAddMeterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.remove.meter._case.FlatBatchRemoveMeterBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.flat.batch.meter.crud._case.aug.flat.batch.update.meter._case.FlatBatchUpdateMeterBuilder;
 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.FlatBatchFailureMeterIdCase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureMeterIdCaseBuilder;
 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;
@@ -40,9 +40,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.ba
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.batch.meter.output.list.grouping.BatchFailedMetersOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.remove.meters.batch.input.BatchRemoveMeters;
 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 FlatBatchMeterAdapters}.
@@ -59,13 +62,13 @@ public class FlatBatchMeterAdaptersTest {
         final BatchPlanStep planStep = new BatchPlanStep(BatchStepType.FLOW_ADD);
         planStep.setBarrierAfter(true);
         planStep.getTaskBag().addAll(Lists.newArrayList(
-                createAddMeterBatch(1L),
-                createAddMeterBatch(2L)));
+                createAddMeterBatch(Uint32.ONE),
+                createAddMeterBatch(Uint32.TWO)));
 
         final AddMetersBatchInput addMetersBatchInput =
                 FlatBatchMeterAdapters.adaptFlatBatchAddMeter(planStep, NODE_REF);
 
-        Assert.assertTrue(addMetersBatchInput.isBarrierAfter());
+        Assert.assertTrue(addMetersBatchInput.getBarrierAfter());
         Assert.assertEquals(2, addMetersBatchInput.nonnullBatchAddMeters().size());
         final Iterator<BatchAddMeters> it = addMetersBatchInput.nonnullBatchAddMeters().values().iterator();
 
@@ -73,19 +76,21 @@ public class FlatBatchMeterAdaptersTest {
         Assert.assertEquals(2L, it.next().getMeterId().getValue().longValue());
     }
 
-    private static FlatBatchAddMeter createAddMeterBatch(final long groupIdValue) {
+    private static FlatBatchAddMeter createAddMeterBatch(final Uint32 groupIdValue) {
         return new FlatBatchAddMeterBuilder()
                 .setMeterId(new MeterId(groupIdValue))
+                .setBatchOrder(groupIdValue.toUint16())
                 .build();
     }
 
-    private static FlatBatchRemoveMeter createRemoveMeterBatch(final long groupIdValue) {
+    private static FlatBatchRemoveMeter createRemoveMeterBatch(final Uint32 groupIdValue) {
         return new FlatBatchRemoveMeterBuilder()
                 .setMeterId(new MeterId(groupIdValue))
+                .setBatchOrder(groupIdValue.toUint16())
                 .build();
     }
 
-    private static FlatBatchUpdateMeter createUpdateMeterBatch(final long groupIdValue) {
+    private static FlatBatchUpdateMeter createUpdateMeterBatch(final Uint32 groupIdValue) {
         return new FlatBatchUpdateMeterBuilder()
                 .setOriginalBatchedMeter(new OriginalBatchedMeterBuilder()
                         .setMeterId(new MeterId(groupIdValue))
@@ -93,6 +98,7 @@ public class FlatBatchMeterAdaptersTest {
                 .setUpdatedBatchedMeter(new UpdatedBatchedMeterBuilder()
                         .setMeterId(new MeterId(groupIdValue))
                         .build())
+                .setBatchOrder(groupIdValue.toUint16())
                 .build();
     }
 
@@ -101,14 +107,14 @@ public class FlatBatchMeterAdaptersTest {
         final BatchPlanStep planStep = new BatchPlanStep(BatchStepType.FLOW_REMOVE);
         planStep.setBarrierAfter(true);
         planStep.getTaskBag().addAll(Lists.newArrayList(
-                createRemoveMeterBatch(1L),
-                createRemoveMeterBatch(2L)));
+                createRemoveMeterBatch(Uint32.ONE),
+                createRemoveMeterBatch(Uint32.TWO)));
 
         final RemoveMetersBatchInput removeMetersBatchInput =
                 FlatBatchMeterAdapters.adaptFlatBatchRemoveMeter(planStep, NODE_REF);
         Iterator<BatchRemoveMeters> iterator = removeMetersBatchInput.nonnullBatchRemoveMeters().values().iterator();
 
-        Assert.assertTrue(removeMetersBatchInput.isBarrierAfter());
+        Assert.assertTrue(removeMetersBatchInput.getBarrierAfter());
         Assert.assertEquals(2, removeMetersBatchInput.nonnullBatchRemoveMeters().size());
         Assert.assertEquals(1L, iterator.next().getMeterId().getValue().longValue());
         Assert.assertEquals(2L, iterator.next().getMeterId().getValue().longValue());
@@ -119,13 +125,13 @@ public class FlatBatchMeterAdaptersTest {
         final BatchPlanStep planStep = new BatchPlanStep(BatchStepType.FLOW_UPDATE);
         planStep.setBarrierAfter(true);
         planStep.getTaskBag().addAll(Lists.newArrayList(
-                createUpdateMeterBatch(1L),
-                createUpdateMeterBatch(2L)));
+                createUpdateMeterBatch(Uint32.ONE),
+                createUpdateMeterBatch(Uint32.TWO)));
 
         final UpdateMetersBatchInput updateMetersBatchInput =
                 FlatBatchMeterAdapters.adaptFlatBatchUpdateMeter(planStep, NODE_REF);
 
-        Assert.assertTrue(updateMetersBatchInput.isBarrierAfter());
+        Assert.assertTrue(updateMetersBatchInput.getBarrierAfter());
         Assert.assertEquals(2, updateMetersBatchInput.getBatchUpdateMeters().size());
         Assert.assertEquals(1L, updateMetersBatchInput.getBatchUpdateMeters().get(0)
                 .getUpdatedBatchedMeter().getMeterId().getValue().longValue());
@@ -136,11 +142,11 @@ public class FlatBatchMeterAdaptersTest {
     @Test
     public void testCreateBatchMeterChainingFunction_failures() {
         final RpcResult<BatchMeterOutputListGrouping> input = RpcResultBuilder.<BatchMeterOutputListGrouping>failed()
-                .withError(RpcError.ErrorType.APPLICATION, "ut-meterError")
+                .withError(ErrorType.APPLICATION, "ut-meterError")
                 .withResult(new AddMetersBatchOutputBuilder()
-                        .setBatchFailedMetersOutput(Lists.newArrayList(
-                                createBatchFailedMetersOutput(0, 1L),
-                                createBatchFailedMetersOutput(1, 2L)
+                        .setBatchFailedMetersOutput(BindingMap.ordered(
+                                createBatchFailedMetersOutput(Uint16.ZERO, Uint32.ONE),
+                                createBatchFailedMetersOutput(Uint16.ONE, Uint32.TWO)
                         ))
                         .build())
                 .build();
@@ -173,15 +179,15 @@ public class FlatBatchMeterAdaptersTest {
         Assert.assertEquals(0, rpcResult.getResult().nonnullBatchFailure().size());
     }
 
-    private static BatchFailedMetersOutput createBatchFailedMetersOutput(final Integer batchOrder,
-            final long groupIdValue) {
+    private static BatchFailedMetersOutput createBatchFailedMetersOutput(final Uint16 batchOrder,
+            final Uint32 groupIdValue) {
         return new BatchFailedMetersOutputBuilder()
                 .setMeterId(new MeterId(groupIdValue))
                 .setBatchOrder(batchOrder)
                 .build();
     }
 
-    private static 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 FlatBatchFailureMeterIdCaseBuilder()