X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Ffactories%2FMultipartReplyMessageFactoryTest.java;h=d246bdc8061b9a8eb241671d0687d545ad6f7ee3;hb=26aeaa7e2754b2cf4f6ad63055ab3ce34f68c961;hp=cc43e50e35d078f3b6679d47dcd49e79570af3dc;hpb=6f617b9dee9173581e8501dcd3c2f365f9a04f79;p=openflowjava.git diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java index cc43e50e..d246bdc8 100644 --- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java +++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactoryTest.java @@ -13,9 +13,15 @@ import io.netty.buffer.ByteBuf; import java.math.BigInteger; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry; +import org.opendaylight.openflowjava.protocol.api.extensibility.MessageCodeKey; +import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer; +import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl; import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper; import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils; +import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdAction; @@ -50,6 +56,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortState; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPort; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OxmMatchType; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessage; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDropCase; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDscpRemarkCase; @@ -74,6 +81,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.desc._case.MultipartReplyDesc; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.experimenter._case.MultipartReplyExperimenter; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow._case.MultipartReplyFlow; +import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.flow._case.multipart.reply.flow.FlowStats; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group._case.MultipartReplyGroup; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.desc._case.MultipartReplyGroupDesc; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter._case.MultipartReplyMeter; @@ -92,6 +100,19 @@ import org.slf4j.LoggerFactory; */ public class MultipartReplyMessageFactoryTest { + private OFDeserializer multipartFactory; + + /** + * Initializes deserializer registry and lookups correct deserializer + */ + @Before + public void startUp() { + DeserializerRegistry registry = new DeserializerRegistryImpl(); + registry.init(); + multipartFactory = registry.getDeserializer( + new MessageCodeKey(EncodeConstants.OF13_VERSION_ID, 19, MultipartReplyMessage.class)); + } + private static final Logger LOGGER = LoggerFactory .getLogger(MultipartReplyMessageFactoryTest.class); @@ -134,7 +155,7 @@ public class MultipartReplyMessageFactoryTest { bb.writeBytes(dpDescBytes); ByteBufUtils.padBuffer((DESC_STR_LEN - dpDescBytes.length), bb); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x00, builtByFactory.getType().getIntValue()); @@ -154,7 +175,7 @@ public class MultipartReplyMessageFactoryTest { @Test public void testMultipartReplyFlowBody(){ ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00 "+ - "00 0C "+//length + "00 48 "+//length "08 "+//tableId "00 "+//pad_01 "00 00 00 09 "+//durationSec @@ -164,35 +185,55 @@ public class MultipartReplyMessageFactoryTest { "00 0F "+//hardTimeout "00 0B "+//flags "00 00 00 00 "+//pad_02 - "00 01 01 01 01 01 01 01 "+//cookie - "00 01 01 01 01 01 01 01 "+//packetCount - "00 01 01 01 01 01 01 01"//byteCount - ); + "FF 01 01 01 01 01 01 01 "+//cookie + "EF 01 01 01 01 01 01 01 "+//packetCount + "7F 01 01 01 01 01 01 01 "+//byteCount + "00 01 00 04 00 00 00 00 "+//empty match + "00 01 00 08 06 00 00 00 "+ + "00 01 00 08 06 00 00 00 "+ + "00 48 "+//length + "08 "+//tableId + "00 "+//pad_01 + "00 00 00 09 "+//durationSec + "00 00 00 07 "+//durationNsec + "00 0C "+//priority + "00 0E "+//idleTimeout + "00 0F "+//hardTimeout + "00 0B "+//flags + "00 00 00 00 "+//pad_02 + "FF 01 01 01 01 01 01 01 "+//cookie + "EF 01 01 01 01 01 01 01 "+//packetCount + "7F 01 01 01 01 01 01 01 "+//byteCount + "00 01 00 04 00 00 00 00 "+//empty match + "00 01 00 08 06 00 00 00 "+ + "00 01 00 08 06 00 00 00"); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x01, builtByFactory.getType().getIntValue()); Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE()); MultipartReplyFlowCase messageCase = (MultipartReplyFlowCase) builtByFactory.getMultipartReplyBody(); MultipartReplyFlow message = messageCase.getMultipartReplyFlow(); - Assert.assertEquals("Wrong tableId", 8, message.getFlowStats().get(0).getTableId().intValue()); - Assert.assertEquals("Wrong durationSec", 9, message.getFlowStats().get(0).getDurationSec().intValue()); - Assert.assertEquals("Wrong durationNsec", 7, message.getFlowStats().get(0).getDurationNsec().intValue()); - Assert.assertEquals("Wrong priority", 12, message.getFlowStats().get(0).getPriority().intValue()); - Assert.assertEquals("Wrong idleTimeOut", 14, message.getFlowStats().get(0).getIdleTimeout().intValue()); - Assert.assertEquals("Wrong hardTimeOut", 15, message.getFlowStats().get(0).getHardTimeout().intValue()); + FlowStats flowStats1 = message.getFlowStats().get(0); + Assert.assertEquals("Wrong tableId", 8, flowStats1.getTableId().intValue()); + Assert.assertEquals("Wrong durationSec", 9, flowStats1.getDurationSec().intValue()); + Assert.assertEquals("Wrong durationNsec", 7, flowStats1.getDurationNsec().intValue()); + Assert.assertEquals("Wrong priority", 12, flowStats1.getPriority().intValue()); + Assert.assertEquals("Wrong idleTimeOut", 14, flowStats1.getIdleTimeout().intValue()); + Assert.assertEquals("Wrong hardTimeOut", 15, flowStats1.getHardTimeout().intValue()); Assert.assertEquals("Wrong flags", new FlowModFlags(true, false, true, false, true), - message.getFlowStats().get(0).getFlags()); + flowStats1.getFlags()); Assert.assertEquals("Wrong cookie", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), - message.getFlowStats().get(0).getCookie()); + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + flowStats1.getCookie()); Assert.assertEquals("Wrong packetCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), - message.getFlowStats().get(0).getPacketCount()); + new BigInteger(1, new byte[]{(byte) 0xEF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + flowStats1.getPacketCount()); Assert.assertEquals("Wrong byteCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), - message.getFlowStats().get(0).getByteCount()); + new BigInteger(1, new byte[]{(byte) 0x7F, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + flowStats1.getByteCount()); + Assert.assertEquals("Wrong match type", OxmMatchType.class, flowStats1.getMatch().getType()); } /** @@ -201,13 +242,13 @@ public class MultipartReplyMessageFactoryTest { @Test public void testMultipartReplyAggregateBody(){ ByteBuf bb = BufferHelper.buildBuffer("00 02 00 01 00 00 00 00 "+ - "00 01 01 01 01 01 01 01 "+//packetCount - "00 01 01 01 01 01 01 01 "+//byteCount + "FF 01 01 01 01 01 01 01 "+//packetCount + "0F 01 01 01 01 01 01 01 "+//byteCount "00 00 00 08 "+//flowCount "00 00 00 00"//pad ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x02, builtByFactory.getType().getIntValue()); @@ -215,10 +256,10 @@ public class MultipartReplyMessageFactoryTest { MultipartReplyAggregateCase messageCase = (MultipartReplyAggregateCase) builtByFactory.getMultipartReplyBody(); MultipartReplyAggregate message = messageCase.getMultipartReplyAggregate(); Assert.assertEquals("Wrong packetCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getPacketCount()); Assert.assertEquals("Wrong byteCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0x0F, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getByteCount()); Assert.assertEquals("Wrong flowCount", 8, @@ -234,11 +275,11 @@ public class MultipartReplyMessageFactoryTest { "08 "+//tableId "00 00 00 "+//pad "00 00 00 10 "+//activeCount - "00 01 01 01 01 01 01 01 "+//lookupCount - "00 01 01 01 01 01 01 01"//matchedCount + "FF 01 01 01 01 01 01 01 "+//lookupCount + "AF 01 01 01 01 01 01 01"//matchedCount ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x03, builtByFactory.getType().getIntValue()); @@ -249,10 +290,10 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong tableId", 8, message.getTableStats().get(0).getTableId().intValue()); Assert.assertEquals("Wrong activeCount", 16, message.getTableStats().get(0).getActiveCount().longValue()); Assert.assertEquals("Wrong lookupCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getTableStats().get(0).getLookupCount()); Assert.assertEquals("Wrong matchedCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xAF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getTableStats().get(0).getMatchedCount()); } @@ -264,23 +305,23 @@ public class MultipartReplyMessageFactoryTest { ByteBuf bb = BufferHelper.buildBuffer("00 04 00 01 00 00 00 00 "+ "00 00 00 FF "+//portNo "00 00 00 00 "+//pad - "00 01 01 01 01 01 01 01 "+//rxPackets - "00 02 02 02 02 02 02 02 "+//txPackets - "00 02 03 02 03 02 03 02 "+//rxBytes - "00 02 03 02 03 02 03 02 "+//txBytes - "00 02 03 02 03 02 03 02 "+//rxDropped - "00 02 03 02 03 02 03 02 "+//txDropped - "00 02 03 02 03 02 03 02 "+//rxErrors - "00 02 03 02 03 02 03 02 "+//txErrors - "00 02 03 02 03 02 03 02 "+//rxFrameErr - "00 02 03 02 03 02 03 02 "+//rxOverErr - "00 02 03 02 03 02 03 02 "+//rxCrcErr - "00 02 03 02 03 02 03 02 "+//collisions + "FF 01 01 01 01 01 01 01 "+//rxPackets + "FF 02 02 02 02 02 02 02 "+//txPackets + "FF 02 03 02 03 02 03 02 "+//rxBytes + "FF 02 03 02 03 02 03 02 "+//txBytes + "FF 02 03 02 03 02 03 02 "+//rxDropped + "FF 02 03 02 03 02 03 02 "+//txDropped + "FF 02 03 02 03 02 03 02 "+//rxErrors + "FF 02 03 02 03 02 03 02 "+//txErrors + "FF 02 03 02 03 02 03 02 "+//rxFrameErr + "FF 02 03 02 03 02 03 02 "+//rxOverErr + "FF 02 03 02 03 02 03 02 "+//rxCrcErr + "FF 02 03 02 03 02 03 02 "+//collisions "00 00 00 02 "+//durationSec "00 00 00 04"//durationNsec ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x04, builtByFactory.getType().getIntValue()); @@ -289,40 +330,40 @@ public class MultipartReplyMessageFactoryTest { MultipartReplyPortStats message = messageCase.getMultipartReplyPortStats(); Assert.assertEquals("Wrong portNo", 255, message.getPortStats().get(0).getPortNo().intValue()); Assert.assertEquals("Wrong rxPackets", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getPortStats().get(0).getRxPackets()); Assert.assertEquals("Wrong txPackets", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getPortStats().get(0).getTxPackets()); Assert.assertEquals("Wrong rxBytes", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getRxBytes()); Assert.assertEquals("Wrong txBytes", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getTxBytes()); Assert.assertEquals("Wrong rxDropped", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getRxDropped()); Assert.assertEquals("Wrong txDropped", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getTxDropped()); Assert.assertEquals("Wrong rxErrors", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getRxErrors()); Assert.assertEquals("Wrong txErrors", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getTxErrors()); Assert.assertEquals("Wrong rxFrameErr", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getRxFrameErr()); Assert.assertEquals("Wrong rxOverErr", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getRxOverErr()); Assert.assertEquals("Wrong rxCrcErr", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getRxCrcErr()); Assert.assertEquals("Wrong collisions", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getPortStats().get(0).getCollisions()); Assert.assertEquals("Wrong durationSec", 2, message.getPortStats().get(0).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec", 4, message.getPortStats().get(0).getDurationNsec().intValue()); @@ -336,14 +377,14 @@ public class MultipartReplyMessageFactoryTest { ByteBuf bb = BufferHelper.buildBuffer("00 05 00 01 00 00 00 00 "+ "00 00 00 FF "+//portNo "00 00 00 10 "+//queueId - "00 02 03 02 03 02 03 02 "+//txBytes - "00 02 02 02 02 02 02 02 "+//txPackets - "00 02 03 02 03 02 03 02 "+//txErrors + "FF 02 03 02 03 02 03 02 "+//txBytes + "FF 02 02 02 02 02 02 02 "+//txPackets + "FF 02 03 02 03 02 03 02 "+//txErrors "00 00 00 02 "+//durationSec "00 00 00 04"//durationNsec ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x05, builtByFactory.getType().getIntValue()); @@ -353,13 +394,13 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong portNo", 255, message.getQueueStats().get(0).getPortNo().intValue()); Assert.assertEquals("Wrong queueId", 16, message.getQueueStats().get(0).getQueueId().intValue()); Assert.assertEquals("Wrong txBytes", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getQueueStats().get(0).getTxBytes()); Assert.assertEquals("Wrong txPackets", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getQueueStats().get(0).getTxPackets()); Assert.assertEquals("Wrong txErrors", - new BigInteger(new byte[]{0x00, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x03, 0x02, 0x03, 0x02, 0x03, 0x02}), message.getQueueStats().get(0).getTxErrors()); Assert.assertEquals("Wrong durationSec", 2, message.getQueueStats().get(0).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec", 4, message.getQueueStats().get(0).getDurationNsec().intValue()); @@ -376,30 +417,30 @@ public class MultipartReplyMessageFactoryTest { "00 00 00 10 "+//groupId "00 00 00 12 "+//refCount "00 00 00 00 "+//pad2 - "00 01 01 01 01 01 01 01 "+//packetCount - "00 01 01 01 01 01 01 01 "+//byteCount + "FF 01 01 01 01 01 01 01 "+//packetCount + "FF 01 01 01 01 01 01 01 "+//byteCount "00 00 00 08 "+//durationSec "00 00 00 09 "+//durationNsec - "00 01 01 01 01 01 01 01 "+//packetCountBucket - "00 01 01 01 01 01 01 01 "+//byteCountBucket - "00 02 02 02 02 02 02 02 "+//packetCountBucket_2 - "00 02 02 02 02 02 02 02 "+//byteCountBucket_2 + "FF 01 01 01 01 01 01 01 "+//packetCountBucket + "FF 01 01 01 01 01 01 01 "+//byteCountBucket + "FF 02 02 02 02 02 02 02 "+//packetCountBucket_2 + "FF 02 02 02 02 02 02 02 "+//byteCountBucket_2 "00 48 "+//length_2 "00 00 "+//pad1.2 "00 00 00 10 "+//groupId_2 "00 00 00 12 "+//refCount_2 "00 00 00 00 "+//pad2.2 - "00 01 01 01 01 01 01 01 "+//packetCount_2 - "00 01 01 01 01 01 01 01 "+//byteCount_2 + "FF 01 01 01 01 01 01 01 "+//packetCount_2 + "FF 01 01 01 01 01 01 01 "+//byteCount_2 "00 00 00 08 "+//durationSec_2 "00 00 00 09 "+//durationNsec_2 - "00 01 01 01 01 01 01 01 "+//packetCountBucket_1.2 - "00 01 01 01 01 01 01 01 "+//byteCountBucket_1.2 - "00 02 02 02 02 02 02 02 "+//packetCountBucket_2.2 - "00 02 02 02 02 02 02 02"//byteCountBucket_2.2 + "FF 01 01 01 01 01 01 01 "+//packetCountBucket_1.2 + "FF 01 01 01 01 01 01 01 "+//byteCountBucket_1.2 + "FF 02 02 02 02 02 02 02 "+//packetCountBucket_2.2 + "FF 02 02 02 02 02 02 02"//byteCountBucket_2.2 ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0x06, builtByFactory.getType().getIntValue()); @@ -409,47 +450,47 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong groupId", 16, message.getGroupStats().get(0).getGroupId().getValue().intValue()); Assert.assertEquals("Wrong refCount", 18, message.getGroupStats().get(0).getRefCount().intValue()); Assert.assertEquals("Wrong packetCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(0).getPacketCount()); Assert.assertEquals("Wrong byteCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(0).getByteCount()); Assert.assertEquals("Wrong durationSec", 8, message.getGroupStats().get(0).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec", 9, message.getGroupStats().get(0).getDurationNsec().intValue()); Assert.assertEquals("Wrong packetCountBucket", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(0).getBucketStats().get(0).getPacketCount()); Assert.assertEquals("Wrong byteCountBucket", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(0).getBucketStats().get(0).getByteCount()); Assert.assertEquals("Wrong packetCountBucket_2", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getGroupStats().get(0).getBucketStats().get(1).getPacketCount()); Assert.assertEquals("Wrong byteCountBucket_2", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getGroupStats().get(0).getBucketStats().get(1).getByteCount()); Assert.assertEquals("Wrong groupId_2", 16, message.getGroupStats().get(1).getGroupId().getValue().intValue()); Assert.assertEquals("Wrong refCount_2", 18, message.getGroupStats().get(1).getRefCount().intValue()); Assert.assertEquals("Wrong packetCount_2", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(1).getPacketCount()); Assert.assertEquals("Wrong byteCount_2", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(1).getByteCount()); Assert.assertEquals("Wrong durationSec_2", 8, message.getGroupStats().get(1).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec_2", 9, message.getGroupStats().get(1).getDurationNsec().intValue()); Assert.assertEquals("Wrong packetCountBucket_1.2", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(1).getBucketStats().get(0).getPacketCount()); Assert.assertEquals("Wrong byteCountBucket_1.2", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getGroupStats().get(1).getBucketStats().get(0).getByteCount()); Assert.assertEquals("Wrong packetCountBucket_2.2", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getGroupStats().get(1).getBucketStats().get(1).getPacketCount()); Assert.assertEquals("Wrong byteCountBucket_2.2", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getGroupStats().get(1).getBucketStats().get(1).getByteCount()); } @@ -467,7 +508,7 @@ public class MultipartReplyMessageFactoryTest { "00 00"//pad ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 11, builtByFactory.getType().getIntValue()); @@ -492,19 +533,19 @@ public class MultipartReplyMessageFactoryTest { "00 58 "+//len "00 00 00 00 00 00 "+//pad "00 00 00 07 "+//flowCount - "00 01 01 01 01 01 01 01 "+//packetInCount - "00 01 01 01 01 01 01 01 "+//byteInCount + "FF 01 01 01 01 01 01 01 "+//packetInCount + "FF 01 01 01 01 01 01 01 "+//byteInCount "00 00 00 05 "+//durationSec "00 00 00 05 "+//durationNsec - "00 01 01 01 01 01 01 01 "+//packetBandCount_01 - "00 01 01 01 01 01 01 01 "+//byteBandCount_01 - "00 02 02 02 02 02 02 02 "+//packetBandCount_02 - "00 02 02 02 02 02 02 02 "+//byteBandCount_02 - "00 03 03 03 03 03 03 03 "+//packetBandCount_03 - "00 03 03 03 03 03 03 03"//byteBandCount_03 + "FF 01 01 01 01 01 01 01 "+//packetBandCount_01 + "FF 01 01 01 01 01 01 01 "+//byteBandCount_01 + "FF 02 02 02 02 02 02 02 "+//packetBandCount_02 + "FF 02 02 02 02 02 02 02 "+//byteBandCount_02 + "FF 03 03 03 03 03 03 03 "+//packetBandCount_03 + "FF 03 03 03 03 03 03 03"//byteBandCount_03 ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue()); @@ -516,32 +557,32 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong flowCount", 7, message.getMeterStats().get(0).getFlowCount().intValue()); Assert.assertEquals("Wrong packetInCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getPacketInCount()); Assert.assertEquals("Wrong byteInCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getByteInCount()); Assert.assertEquals("Wrong durationSec", 5, message.getMeterStats().get(0).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec", 5, message.getMeterStats().get(0).getDurationNsec().intValue()); Assert.assertEquals("Wrong packetBandCount_01", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_01", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount()); Assert.assertEquals("Wrong packetBandCount_02", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_02", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount()); Assert.assertEquals("Wrong packetBandCount_03", - new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_03", - new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount()); } @@ -555,33 +596,33 @@ public class MultipartReplyMessageFactoryTest { "00 58 "+//len_0 "00 00 00 00 00 00 "+//pad_0 "00 00 00 07 "+//flowCount_0 - "00 01 01 01 01 01 01 01 "+//packetInCount_0 - "00 01 01 01 01 01 01 01 "+//byteInCount_0 + "FF 01 01 01 01 01 01 01 "+//packetInCount_0 + "FF 01 01 01 01 01 01 01 "+//byteInCount_0 "00 00 00 05 "+//durationSec_0 "00 00 00 05 "+//durationNsec_0 - "00 01 01 01 01 01 01 01 "+//packetBandCount_01 - "00 01 01 01 01 01 01 01 "+//byteBandCount_01 - "00 02 02 02 02 02 02 02 "+//packetBandCount_02 - "00 02 02 02 02 02 02 02 "+//byteBandCount_02 - "00 03 03 03 03 03 03 03 "+//packetBandCount_03 - "00 03 03 03 03 03 03 03 "+//byteBandCount_03 + "FF 01 01 01 01 01 01 01 "+//packetBandCount_01 + "FF 01 01 01 01 01 01 01 "+//byteBandCount_01 + "FF 02 02 02 02 02 02 02 "+//packetBandCount_02 + "FF 02 02 02 02 02 02 02 "+//byteBandCount_02 + "FF 03 03 03 03 03 03 03 "+//packetBandCount_03 + "FF 03 03 03 03 03 03 03 "+//byteBandCount_03 "00 00 00 08 "+//meterId_1 "00 58 "+//len_1 "00 00 00 00 00 00 "+//pad_1 "00 00 00 07 "+//flowCount_1 - "00 01 01 01 01 01 01 01 "+//packetInCount_1 - "00 01 01 01 01 01 01 01 "+//byteInCount_1 + "FF 01 01 01 01 01 01 01 "+//packetInCount_1 + "FF 01 01 01 01 01 01 01 "+//byteInCount_1 "00 00 00 05 "+//durationSec_1 "00 00 00 05 "+//durationNsec_1 - "00 01 01 01 01 01 01 01 "+//packetBandCount_11 - "00 01 01 01 01 01 01 01 "+//byteBandCount_11 - "00 02 02 02 02 02 02 02 "+//packetBandCount_12 - "00 02 02 02 02 02 02 02 "+//byteBandCount_12 - "00 03 03 03 03 03 03 03 "+//packetBandCount_13 - "00 03 03 03 03 03 03 03"//byteBandCount_13 + "FF 01 01 01 01 01 01 01 "+//packetBandCount_11 + "FF 01 01 01 01 01 01 01 "+//byteBandCount_11 + "FF 02 02 02 02 02 02 02 "+//packetBandCount_12 + "FF 02 02 02 02 02 02 02 "+//byteBandCount_12 + "FF 03 03 03 03 03 03 03 "+//packetBandCount_13 + "FF 03 03 03 03 03 03 03"//byteBandCount_13 ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue()); @@ -593,32 +634,32 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong flowCount", 7, message.getMeterStats().get(0).getFlowCount().intValue()); Assert.assertEquals("Wrong packetInCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getPacketInCount()); Assert.assertEquals("Wrong byteInCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getByteInCount()); Assert.assertEquals("Wrong durationSec", 5, message.getMeterStats().get(0).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec", 5, message.getMeterStats().get(0).getDurationNsec().intValue()); Assert.assertEquals("Wrong packetBandCount_01", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_01", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount()); Assert.assertEquals("Wrong packetBandCount_02", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_02", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount()); Assert.assertEquals("Wrong packetBandCount_03", - new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_03", - new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount()); Assert.assertEquals("Wrong meterId", 8, @@ -626,32 +667,32 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong flowCount", 7, message.getMeterStats().get(1).getFlowCount().intValue()); Assert.assertEquals("Wrong packetInCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(1).getPacketInCount()); Assert.assertEquals("Wrong byteInCount", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(1).getByteInCount()); Assert.assertEquals("Wrong durationSec", 5, message.getMeterStats().get(1).getDurationSec().intValue()); Assert.assertEquals("Wrong durationNsec", 5, message.getMeterStats().get(1).getDurationNsec().intValue()); Assert.assertEquals("Wrong packetBandCount_01", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(1).getMeterBandStats().get(0).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_01", - new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), message.getMeterStats().get(1).getMeterBandStats().get(0).getByteBandCount()); Assert.assertEquals("Wrong packetBandCount_02", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getMeterStats().get(1).getMeterBandStats().get(1).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_02", - new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), message.getMeterStats().get(1).getMeterBandStats().get(1).getByteBandCount()); Assert.assertEquals("Wrong packetBandCount_03", - new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), message.getMeterStats().get(1).getMeterBandStats().get(2).getPacketBandCount()); Assert.assertEquals("Wrong byteBandCount_03", - new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), + new BigInteger(1, new byte[]{(byte) 0xFF, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), message.getMeterStats().get(1).getMeterBandStats().get(2).getByteBandCount()); } @@ -682,7 +723,7 @@ public class MultipartReplyMessageFactoryTest { "00 00 00 04"//meterBandExperimenter.experimenter ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue()); @@ -752,7 +793,7 @@ public class MultipartReplyMessageFactoryTest { "00 00 00"//meterBandDscp01.pad ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue()); @@ -810,7 +851,7 @@ public class MultipartReplyMessageFactoryTest { "00 00 01 01 00 00 01 01" ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 0xFFFF, builtByFactory.getType().getIntValue()); @@ -833,7 +874,7 @@ public class MultipartReplyMessageFactoryTest { "00 01 02 03 "+ //portNo "00 00 00 00 "+ //padding01 "08 00 27 00 B0 EB " + //mac address - "00 00 "); //padding02 + "00 00"); //padding02 //port name String portName = "SampleText"; byte[] portNameBytes = new byte[MAX_PORT_NAME_LEN]; @@ -852,7 +893,7 @@ public class MultipartReplyMessageFactoryTest { ); bb.writeBytes(bb2.copy(4, bb2.readableBytes()-4));//excluding version and xid - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 13, builtByFactory.getType().getIntValue()); @@ -923,7 +964,7 @@ public class MultipartReplyMessageFactoryTest { "00 08 "+//copyTTLIntLen "00 00 00 00"//copyTTLInPad ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue()); @@ -943,26 +984,26 @@ public class MultipartReplyMessageFactoryTest { message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue()); Assert.assertEquals("Wrong outputType", Output.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getType()); Assert.assertEquals("Wrong outputPort", 4351, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getAugmentation(PortAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getAugmentation(PortAction.class). getPort().getValue().intValue()); Assert.assertEquals("Wrong outputMaxLen", 65535, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getAugmentation(MaxLengthAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getAugmentation(MaxLengthAction.class). getMaxLength().intValue()); Assert.assertEquals("Wrong copyTtlOutType", CopyTtlOut.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getType()); Assert.assertEquals("Wrong copyTtlInType", CopyTtlIn.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2) + .getType()); } /** @@ -1002,7 +1043,7 @@ public class MultipartReplyMessageFactoryTest { "00 00"//pushPbbPad ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue()); @@ -1020,35 +1061,35 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong bucketWatchGroup", 4, message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue()); Assert.assertEquals("Wrong setMplsTtlType", SetMplsTtl.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getType()); Assert.assertEquals("Wrong setMplsTtlMPLS_TTL", 9, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getAugmentation(MplsTtlAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getAugmentation(MplsTtlAction.class). getMplsTtl().intValue()); Assert.assertEquals("Wrong decMplsTtlType", DecMplsTtl.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getType()); Assert.assertEquals("Wrong pushVlanType", PushVlan.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2) + .getType()); Assert.assertEquals("Wrong pushVlanEthertype", 32, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2). - getAction().getAugmentation(EthertypeAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2) + .getAugmentation(EthertypeAction.class). getEthertype().getValue().intValue()); Assert.assertEquals("Wrong pushMplsType", PushMpls.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(3). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3) + .getType()); Assert.assertEquals("Wrong pushMplsEthertype", 255, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(3). - getAction().getAugmentation(EthertypeAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3). + getAugmentation(EthertypeAction.class). getEthertype().getValue().intValue()); Assert.assertEquals("Wrong pushPbbType", PushPbb.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(4). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4) + .getType()); Assert.assertEquals("Wrong pushPbbEthertype", 4095, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(4). - getAction().getAugmentation(EthertypeAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4) + .getAugmentation(EthertypeAction.class). getEthertype().getValue().intValue()); } @@ -1089,7 +1130,7 @@ public class MultipartReplyMessageFactoryTest { "00 00 00 00"//decNwTtlPad ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue()); @@ -1105,35 +1146,35 @@ public class MultipartReplyMessageFactoryTest { Assert.assertEquals("Wrong bucketWatchGroup", 4, message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue()); Assert.assertEquals("Wrong popVlanType", PopVlan.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getType()); Assert.assertEquals("Wrong popPbbType", PopPbb.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getType()); Assert.assertEquals("Wrong popMplsType", PopMpls.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2) + .getType()); Assert.assertEquals("Wrong popMplsEthertype", 207, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(2). - getAction().getAugmentation(EthertypeAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(2) + .getAugmentation(EthertypeAction.class). getEthertype().getValue().intValue()); Assert.assertEquals("Wrong setQueueType", SetQueue.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(3). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3) + .getType()); Assert.assertEquals("Wrong setQueueQueueId", 13565952, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(3). - getAction().getAugmentation(QueueIdAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(3) + .getAugmentation(QueueIdAction.class). getQueueId().intValue()); Assert.assertEquals("Wrong groupType", Group.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(4). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4) + .getType()); Assert.assertEquals("Wrong groupGroupId", 13565952, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(4). - getAction().getAugmentation(GroupIdAction.class). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(4) + .getAugmentation(GroupIdAction.class). getGroupId().intValue()); Assert.assertEquals("Wrong decNwTtlType", DecNwTtl.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(5). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(5) + .getType()); } /** @@ -1165,7 +1206,7 @@ public class MultipartReplyMessageFactoryTest { "00 00 00 00" ); - MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb); + MultipartReplyMessage builtByFactory = BufferHelper.deserialize(multipartFactory, bb); BufferHelper.checkHeaderV13(builtByFactory); Assert.assertEquals("Wrong type", 7, builtByFactory.getType().getIntValue()); @@ -1185,28 +1226,28 @@ public class MultipartReplyMessageFactoryTest { message.getGroupDesc().get(0).getBucketsList().get(0).getWatchGroup().intValue()); Assert.assertEquals("Wrong nwTTlType", SetNwTtl.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getType()); Assert.assertEquals("Wrong nwTTlnwTTL", 14, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(0). - getAction().getAugmentation(NwTtlAction.class).getNwTtl().intValue()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(0) + .getAugmentation(NwTtlAction.class).getNwTtl().intValue()); Assert.assertEquals("Wrong setFieldType", SetField.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getType()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getType()); Assert.assertEquals("Wrong setFieldOXMClass", OpenflowBasicClass.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmClass()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmClass()); Assert.assertEquals("Wrong setFieldOXMField", InPort.class, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmMatchField()); + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0).getOxmMatchField()); Assert.assertEquals("Wrong setFieldOXMValue", 255, - message.getGroupDesc().get(0).getBucketsList().get(0).getActionsList().get(1). - getAction().getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0). + message.getGroupDesc().get(0).getBucketsList().get(0).getAction().get(1) + .getAugmentation(OxmFieldsAction.class).getMatchEntries().get(0). getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue()); } }