Migrate openflow-protocol-impl tests to Uint types

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / MeterModInputMessageFactoryTest.java

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
index 7e0715dc0b0dc912964db406c4b057d1f118913b..4d00442316d5bc0f0b331c9a4995665b9c68f8ec 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
@@ -33,6 +33,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.meter.band.dscp.remark._case.MeterBandDscpRemarkBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.Bands;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.mod.BandsBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 /**
  * Unit tests for MeterModInputMessageFactory.
@@ -65,7 +67,7 @@ public class MeterModInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setCommand(MeterModCommand.forValue(1));
         builder.setFlags(new MeterFlags(false, true, true, false));
-        builder.setMeterId(new MeterId(2248L));
+        builder.setMeterId(new MeterId(Uint32.valueOf(2248)));
         builder.setBands(createBandsList());
         MeterModInput message = builder.build();
 
@@ -94,16 +96,16 @@ public class MeterModInputMessageFactoryTest {
         final MeterBandDropCaseBuilder dropCaseBuilder = new MeterBandDropCaseBuilder();
         MeterBandDropBuilder dropBand = new MeterBandDropBuilder();
         dropBand.setType(MeterBandType.OFPMBTDROP);
-        dropBand.setRate(1L);
-        dropBand.setBurstSize(2L);
+        dropBand.setRate(Uint32.ONE);
+        dropBand.setBurstSize(Uint32.TWO);
         dropCaseBuilder.setMeterBandDrop(dropBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dropCaseBuilder.build()).build());
         final MeterBandDscpRemarkCaseBuilder dscpCaseBuilder = new MeterBandDscpRemarkCaseBuilder();
         MeterBandDscpRemarkBuilder dscpRemarkBand = new MeterBandDscpRemarkBuilder();
         dscpRemarkBand.setType(MeterBandType.OFPMBTDSCPREMARK);
-        dscpRemarkBand.setRate(1L);
-        dscpRemarkBand.setBurstSize(2L);
-        dscpRemarkBand.setPrecLevel((short) 3);
+        dscpRemarkBand.setRate(Uint32.ONE);
+        dscpRemarkBand.setBurstSize(Uint32.TWO);
+        dscpRemarkBand.setPrecLevel(Uint8.valueOf(3));
         dscpCaseBuilder.setMeterBandDscpRemark(dscpRemarkBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dscpCaseBuilder.build()).build());
         return bandsList;
@@ -116,8 +118,8 @@ public class MeterModInputMessageFactoryTest {
         MeterBandDropBuilder dropBand = new MeterBandDropBuilder();
         dropBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
         input.skipBytes(Short.SIZE / Byte.SIZE);
-        dropBand.setRate(input.readUnsignedInt());
-        dropBand.setBurstSize(input.readUnsignedInt());
+        dropBand.setRate(Uint32.fromIntBits(input.readInt()));
+        dropBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
         input.skipBytes(4);
         dropCaseBuilder.setMeterBandDrop(dropBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dropCaseBuilder.build()).build());
@@ -125,9 +127,9 @@ public class MeterModInputMessageFactoryTest {
         MeterBandDscpRemarkBuilder dscpRemarkBand = new MeterBandDscpRemarkBuilder();
         dscpRemarkBand.setType(MeterBandType.forValue(input.readUnsignedShort()));
         input.skipBytes(Short.SIZE / Byte.SIZE);
-        dscpRemarkBand.setRate(input.readUnsignedInt());
-        dscpRemarkBand.setBurstSize(input.readUnsignedInt());
-        dscpRemarkBand.setPrecLevel(input.readUnsignedByte());
+        dscpRemarkBand.setRate(Uint32.fromIntBits(input.readInt()));
+        dscpRemarkBand.setBurstSize(Uint32.fromIntBits(input.readInt()));
+        dscpRemarkBand.setPrecLevel(Uint8.fromByteBits(input.readByte()));
         input.skipBytes(3);
         dscpCaseBuilder.setMeterBandDscpRemark(dscpRemarkBand.build());
         bandsList.add(bandsBuilder.setMeterBand(dscpCaseBuilder.build()).build());
@@ -143,7 +145,7 @@ public class MeterModInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);
         builder.setCommand(MeterModCommand.forValue(1));
         builder.setFlags(new MeterFlags(false, true, true, false));
-        builder.setMeterId(new MeterId(2248L));
+        builder.setMeterId(new MeterId(Uint32.valueOf(2248)));
         builder.setBands(null);
         MeterModInput message = builder.build();