From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Tue, 5 Nov 2013 15:44:55 +0000 (+0100)
Subject: Quickfix - MeterModInputMessageFactory computelength()
X-Git-Tag: jenkins-openflowjava-bulk-release-prepare-only-1~77
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=242ffc21448c8c59c991917ad81a25fe0d964f3b;p=openflowjava.git

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 463c82d4..7421029c 100644
--- 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>
 
     @Override
     public int computeLength(MeterModInput message) {
-        
-        return MESSAGE_LENGTH;
+        int length = MESSAGE_LENGTH;
+        if (message.getBands() != null) {
+            length += message.getBands().size() * LENGTH_OF_METER_BANDS;
+        }
+        return length;
     }
 
     @Override
@@ -78,18 +81,20 @@ public class MeterModInputMessageFactory implements OFSerializer<MeterModInput>
     }
     
     private static void encodeBands(List<Bands> bands, ByteBuf outBuffer) {
-        for (Bands currentBand : bands) {
-            MeterBand meterBand = currentBand.getMeterBand();
-            writeBandCommonFields((MeterBandCommons) meterBand, outBuffer);
-            if (meterBand instanceof MeterBandDrop) {
-                ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DROP, outBuffer);
-            } else if (meterBand instanceof MeterBandDscpRemark) {
-                MeterBandDscpRemark dscpRemarkBand = (MeterBandDscpRemark) meterBand;
-                outBuffer.writeByte(dscpRemarkBand.getPrecLevel());
-                ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DSCP_REMARK, outBuffer);
-            } else if (meterBand instanceof MeterBandExperimenter) {
-                MeterBandExperimenter experimenterBand = (MeterBandExperimenter) meterBand;
-                outBuffer.writeInt(experimenterBand.getExperimenter().intValue());
+        if (bands != null) {
+            for (Bands currentBand : bands) {
+                MeterBand meterBand = currentBand.getMeterBand();
+                writeBandCommonFields((MeterBandCommons) meterBand, outBuffer);
+                if (meterBand instanceof MeterBandDrop) {
+                    ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DROP, outBuffer);
+                } else if (meterBand instanceof MeterBandDscpRemark) {
+                    MeterBandDscpRemark dscpRemarkBand = (MeterBandDscpRemark) meterBand;
+                    outBuffer.writeByte(dscpRemarkBand.getPrecLevel());
+                    ByteBufUtils.padBuffer(PADDING_IN_METER_BAND_DSCP_REMARK, outBuffer);
+                } else if (meterBand instanceof MeterBandExperimenter) {
+                    MeterBandExperimenter experimenterBand = (MeterBandExperimenter) meterBand;
+                    outBuffer.writeInt(experimenterBand.getExperimenter().intValue());
+                }
             }
         }
     }
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 756a1101..1e5f360b 100644
--- 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();
         HelloInputMessageFactory factory = HelloInputMessageFactory.getInstance();
         factory.messageToBuffer(HelloMessageFactoryTest.VERSION_YET_SUPPORTED, out, message);
-        LOGGER.info("bytebuf: " + ByteBufUtils.byteBufToHexString(out));
+        LOGGER.debug("bytebuf: " + ByteBufUtils.byteBufToHexString(out));
         
         BufferHelper.checkHeaderV13(out, factory.getMessageType(), factory.computeLength(message));
         Elements element = readElement(out).get(0);
         Assert.assertEquals("Wrong element type", expectedElement.get(0).getType(), element.getType());
-        LOGGER.info(expectedElement.get(0).getVersionBitmap().toString());
-        LOGGER.info(element.getVersionBitmap().toString());
+        LOGGER.debug(expectedElement.get(0).getVersionBitmap().toString());
+        LOGGER.debug(element.getVersionBitmap().toString());
         Assert.assertArrayEquals("Wrong element bitmap", expectedElement.get(0).getVersionBitmap().toArray(), element.getVersionBitmap().toArray());
     }
     
@@ -110,7 +110,6 @@ public class HelloInputMessageFactoryTest {
     }
     
     private static List<Boolean> readVersionBitmap(int[] input){
-        LOGGER.info("input.length: " + input.length);
         List<Boolean> versionBitmapList = new ArrayList<>();
         for (int i = 0; i < input.length; i++) {
             int mask = input[i];
@@ -118,7 +117,6 @@ public class HelloInputMessageFactoryTest {
                     versionBitmapList.add((mask & (1<<j)) != 0);
             }
         }
-        LOGGER.info("versionbitmaplist.size: " + versionBitmapList.size());
         return versionBitmapList;
     }
 
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 9bddbaf2..65cd206c 100644
--- 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();
         factory.messageToBuffer(HelloMessageFactoryTest.VERSION_YET_SUPPORTED, out, message);
         
-        BufferHelper.checkHeaderV13(out, factory.getMessageType(), factory.computeLength(message));
+        BufferHelper.checkHeaderV13(out, factory.getMessageType(), 64);
         Assert.assertEquals("Wrong meterModCommand", message.getCommand().getIntValue(), out.readUnsignedShort());
         Assert.assertEquals("Wrong meterFlags", message.getFlags(), decodeMeterModFlags(out.readShort()));
         Assert.assertEquals("Wrong meterId", message.getMeterId().getValue().intValue(), out.readUnsignedInt());