Quickfix - MeterModInputMessageFactory computelength()

Changed logging in HelloInputMessageFactoryTest

Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java
index 463c82d468498f9700a71ec8f4c3156c441069cd..7421029c5d18afe85b9e1a02c58bc16ec5b8bfbc 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactory.java
@@ -56,8 +56,11 @@ public class MeterModInputMessageFactory implements OFSerializer<MeterModInput>
 \r
     @Override\r
     public int computeLength(MeterModInput message) {\r
-        \r
-        return MESSAGE_LENGTH;\r
+        int length = MESSAGE_LENGTH;\r
+        if (message.getBands() != null) {\r
+            length += message.getBands().size() * LENGTH_OF_METER_BANDS;\r
+        }\r
+        return length;\r
     }\r
 \r
     @Override\r
@@ -78,18 +81,20 @@ public class MeterModInputMessageFactory implements OFSerializer<MeterModInput>
     }\r
     \r
     private static void encodeBands(List<Bands> bands, ByteBuf outBuffer) {\r
-        for (Bands currentBand : bands) {\r
-            MeterBand meterBand = currentBand.getMeterBand();\r
-            writeBandCommonFields((MeterBandCommons) meterBand, outBuffer);\r
-            if (meterBand instanceof MeterBandDrop) {\r
-                ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DROP, outBuffer);\r
-            } else if (meterBand instanceof MeterBandDscpRemark) {\r
-                MeterBandDscpRemark dscpRemarkBand = (MeterBandDscpRemark) meterBand;\r
-                outBuffer.writeByte(dscpRemarkBand.getPrecLevel());\r
-                ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DSCP_REMARK, outBuffer);\r
-            } else if (meterBand instanceof MeterBandExperimenter) {\r
-                MeterBandExperimenter experimenterBand = (MeterBandExperimenter) meterBand;\r
-                outBuffer.writeInt(experimenterBand.getExperimenter().intValue());\r
+        if (bands != null) {\r
+            for (Bands currentBand : bands) {\r
+                MeterBand meterBand = currentBand.getMeterBand();\r
+                writeBandCommonFields((MeterBandCommons) meterBand, outBuffer);\r
+                if (meterBand instanceof MeterBandDrop) {\r
+                    ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DROP, outBuffer);\r
+                } else if (meterBand instanceof MeterBandDscpRemark) {\r
+                    MeterBandDscpRemark dscpRemarkBand = (MeterBandDscpRemark) meterBand;\r
+                    outBuffer.writeByte(dscpRemarkBand.getPrecLevel());\r
+                    ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DSCP_REMARK, outBuffer);\r
+                } else if (meterBand instanceof MeterBandExperimenter) {\r
+                    MeterBandExperimenter experimenterBand = (MeterBandExperimenter) meterBand;\r
+                    outBuffer.writeInt(experimenterBand.getExperimenter().intValue());\r
+                }\r
             }\r
         }\r
     }\r

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java
index 756a1101d977b0e95e4bac8ff74fc1597d4df3bf..1e5f360bf6d11c429d118df45ecbc30b8cd71bd4 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/HelloInputMessageFactoryTest.java
@@ -60,13 +60,13 @@ public class HelloInputMessageFactoryTest {
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
         HelloInputMessageFactory factory = HelloInputMessageFactory.getInstance();\r
         factory.messageToBuffer(HelloMessageFactoryTest.VERSION_YET_SUPPORTED, out, message);\r
-        LOGGER.info("bytebuf: " + ByteBufUtils.byteBufToHexString(out));\r
+        LOGGER.debug("bytebuf: " + ByteBufUtils.byteBufToHexString(out));\r
         \r
         BufferHelper.checkHeaderV13(out, factory.getMessageType(), factory.computeLength(message));\r
         Elements element = readElement(out).get(0);\r
         Assert.assertEquals("Wrong element type", expectedElement.get(0).getType(), element.getType());\r
-        LOGGER.info(expectedElement.get(0).getVersionBitmap().toString());\r
-        LOGGER.info(element.getVersionBitmap().toString());\r
+        LOGGER.debug(expectedElement.get(0).getVersionBitmap().toString());\r
+        LOGGER.debug(element.getVersionBitmap().toString());\r
         Assert.assertArrayEquals("Wrong element bitmap", expectedElement.get(0).getVersionBitmap().toArray(), element.getVersionBitmap().toArray());\r
     }\r
     \r
@@ -110,7 +110,6 @@ public class HelloInputMessageFactoryTest {
     }\r
     \r
     private static List<Boolean> readVersionBitmap(int[] input){\r
-        LOGGER.info("input.length: " + input.length);\r
         List<Boolean> versionBitmapList = new ArrayList<>();\r
         for (int i = 0; i < input.length; i++) {\r
             int mask = input[i];\r
@@ -118,7 +117,6 @@ public class HelloInputMessageFactoryTest {
                     versionBitmapList.add((mask & (1<<j)) != 0);\r
             }\r
         }\r
-        LOGGER.info("versionbitmaplist.size: " + versionBitmapList.size());\r
         return versionBitmapList;\r
     }\r
 \r

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
index 9bddbaf23de9875d6f424262ee02def11abf9db0..65cd206c9674902c437c0437e9b83f30f38122d2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MeterModInputMessageFactoryTest.java
@@ -48,7 +48,7 @@ public class MeterModInputMessageFactoryTest {
         MeterModInputMessageFactory factory = MeterModInputMessageFactory.getInstance();\r
         factory.messageToBuffer(HelloMessageFactoryTest.VERSION_YET_SUPPORTED, out, message);\r
         \r
-        BufferHelper.checkHeaderV13(out, factory.getMessageType(), factory.computeLength(message));\r
+        BufferHelper.checkHeaderV13(out, factory.getMessageType(), 64);\r
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readUnsignedShort());\r
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));\r
         Assert.assertEquals("Wrong meterId", message.getMeterId().getValue().intValue(), out.readUnsignedInt());\r