multipart request message updated

added meter features, meter config, experimenter, meter description in multipart
reply message
changes in YANG (buckets changed to bucket list, added field data in experimenter
multipart reply message)

Change-Id: I67c219c5b069da482092e2206eb038217e192809
Signed-off-by: Timotej Kubas <timotej.kubas@pantheon.sk>

diff --git a/openflow-protocol-api/src/main/yang/openflow-action.yang b/openflow-protocol-api/src/main/yang/openflow-action.yang
index 232a14707479f954185b1068428be67947ced90c..43157f2b2aa4a4a30596a8a0b4d4006b60829cef 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-action.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-action.yang
@@ -77,98 +77,6 @@ module openflow-action {
         base oft:action;
     }
     
-    /*
-    grouping output {
-        description 
-            "Action structure for OFPAT_OUTPUT, which sends packets out 'port'.
-            When the 'port' is the OFPP_CONTROLLER, 'max_len' indicates the max
-            number of bytes to send. A 'max_len' of zero means no bytes of the
-            packet should be sent. A 'max_len' of OFPCML_NO_BUFFER means that
-            the packet is not buffered and the complete packet is to be sent to
-            the controller.";
-        leaf port {
-            type oft:any-port-number;
-        }
-        leaf max-length {
-            description "Maximum packet length to be send to controller.";
-            type union {
-                type uint16 {
-                    range "0..65294"; // 0..0xff0e
-                }
-                type enumeration {
-                    enum max {
-                        desription
-                            "maximum max_len value which can be used
-                            to request a specific byte length";
-                        value 65509; //0xffe5
-                    }
-                    enum no-buffer {
-                        description 
-                            "indicates that no buffering should be
-                             applied and the whole packet is to be
-                             sent to the controller";
-                        value 65535; //0xffff
-                    }
-                }
-            }
-        }
-    }
-
-    grouping group {
-        leaf group {
-            type oft:group-id; // define action group-id type;
-        }
-    }
-
-    grouping set-queue {
-        leaf queue {
-            type oft:queue-id;
-        }
-    }
-
-    grouping set-mpls-ttl {
-        leaf mpls_ttl {
-            type uint8;
-        }
-    }
-
-    grouping set-nw-ttl {
-        leaf nw_ttl {
-            type uint8;
-        }
-    }
-
-    grouping push-pbb {
-        leaf ethertype {
-            type oft:ether-type;
-        }
-    }
-
-    grouping push-mpls {
-        leaf ethertype {
-            type oft:ether-type;
-        }
-    }
-
-    grouping push-vlan {
-        leaf ethertype {
-            type oft:ether-type;
-        }
-    }
-
-    grouping pop-mpls {
-        leaf ethertype {
-            type oft:ether-type;
-        }
-    }
-
-    grouping set-field {
-        container field {
-            // TODO: figure definition
-        }
-    }
-    */
-    
     container actions-container {
         uses action-header;
     }

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index d0e087b3c2e22d0d6e11007080306aef79e72d3f..d9afe212e0e8b0667928c838ccd4c8f9061c7a7a 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -417,7 +417,7 @@ module openflow-protocol {
                     type uint32;\r
                 }\r
                 \r
-                list buckets {\r
+                list buckets-list {\r
                     uses bucket;\r
                 }\r
             }\r
@@ -793,7 +793,7 @@ module openflow-protocol {
                             leaf group-id {\r
                                 type uint32;\r
                             }\r
-                            list buckets {\r
+                            list buckets-list {\r
                                 uses bucket;\r
                             }\r
                         }\r
@@ -909,6 +909,9 @@ module openflow-protocol {
                         leaf exp-type {\r
                             type uint32;\r
                         }\r
+                        leaf data {\r
+                            type binary;\r
+                        }\r
                     }\r
                 }\r
             } \r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
index 64bf2ac39cedd932e0afb823129e525d7070f3b6..c8bfe6e011d20c77d9b775631efb63986049c421 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/MultipartReplyMessageFactory.java
@@ -8,19 +8,39 @@ import java.util.ArrayList;
 import java.util.List;\r
 \r
 import org.opendaylight.openflowjava.protocol.impl.deserialization.OFDeserializer;\r
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModFlags;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterFlags;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterModCommand;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartRequestFlags;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MultipartType;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortState;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessage;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessageBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDropBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDscpRemarkBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenterBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregate;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregateBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyDesc;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyDescBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyExperimenter;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyExperimenterBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyFlow;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyFlowBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyGroup;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyGroupBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeter;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterConfig;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterConfigBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterFeatures;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterFeaturesBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortDesc;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortDescBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortStats;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortStatsBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyQueue;\r
@@ -33,6 +53,16 @@ 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.group.GroupStatsBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.group.stats.BucketStats;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.group.group.stats.BucketStatsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.MeterStats;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.MeterStatsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.MeterConfig;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.MeterConfigBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.meter.config.Bands;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.config.meter.config.BandsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.meter.stats.MeterBandStats;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.meter.meter.stats.MeterBandStatsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc.Ports;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.desc.PortsBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.stats.PortStats;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.port.stats.PortStatsBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.multipart.reply.queue.QueueStats;\r
@@ -89,6 +119,16 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                  break;         \r
         case 6:  builder.setMultipartReplyBody(setGroup(rawMessage));\r
                  break;\r
+        case 9:  builder.setMultipartReplyBody(setMeter(rawMessage));\r
+                 break;\r
+        case 10:  builder.setMultipartReplyBody(setMeterConfig(rawMessage));\r
+                 break;\r
+        case 11: builder.setMultipartReplyBody(setMeterFeatures(rawMessage));\r
+                 break;\r
+        case 13: builder.setMultipartReplyBody(setPortDesc(rawMessage));\r
+                 break;\r
+        case 0xFFFF: builder.setMultipartReplyBody(setExperimenter(rawMessage));\r
+                 break;\r
         default: \r
                  break;\r
         }\r
@@ -129,7 +169,9 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         MultipartReplyFlowBuilder flowBuilder = new MultipartReplyFlowBuilder();\r
         List<FlowStats> flowStatsList = new ArrayList<>();\r
         FlowStatsBuilder flowStatsBuilder = new FlowStatsBuilder();\r
+        int flowLen = 0;\r
         while (input.readableBytes() > 0) {\r
+            flowLen = input.readUnsignedShort();\r
             flowStatsBuilder.setTableId(input.readUnsignedByte());\r
             input.skipBytes(PADDING_IN_FLOW_STATS_HEADER_01);\r
             flowStatsBuilder.setDurationSec(input.readUnsignedInt());\r
@@ -152,7 +194,8 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             // TODO instructions\r
             flowStatsList.add(flowStatsBuilder.build());\r
         }\r
-        flowBuilder.setFlowStats(flowStatsList);\r
+        flowBuilder.setFlowStats(new ArrayList<>(flowStatsList));\r
+        flowStatsList.clear();\r
         return flowBuilder.build();\r
     }\r
     \r
@@ -196,7 +239,8 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             tableStatsBuilder.setMatchedCount(new BigInteger(matchedCount));\r
             tableStatsList.add(tableStatsBuilder.build());\r
         }\r
-        builder.setTableStats(tableStatsList);\r
+        builder.setTableStats(new ArrayList<>(tableStatsList));\r
+        tableStatsList.clear();\r
         return builder.build();\r
     }\r
     \r
@@ -261,7 +305,8 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             portStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
             portStatsList.add(portStatsBuilder.build());\r
         }\r
-        builder.setPortStats(portStatsList);\r
+        builder.setPortStats(new ArrayList<>(portStatsList));\r
+        portStatsList.clear();\r
         return builder.build();\r
     }\r
     \r
@@ -290,7 +335,8 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             queueStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
             queueStatsList.add(queueStatsBuilder.build());\r
         }\r
-        builder.setQueueStats(queueStatsList);\r
+        builder.setQueueStats(new ArrayList<>(queueStatsList));\r
+        queueStatsList.clear();\r
         return builder.build();\r
     }\r
     \r
@@ -334,12 +380,231 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
                 bucketStatsBuilder.setByteCount(new BigInteger(byteCountBucket));\r
                 bucketStatsList.add(bucketStatsBuilder.build());\r
 \r
-                groupStatsBuilder.setBucketStats(bucketStatsList);\r
-                groupStatsList.add(groupStatsBuilder.build());\r
                 actualLength = actualLength + BUCKET_COUNTER_LENGTH;\r
             } \r
+            groupStatsBuilder.setBucketStats(new ArrayList<>(bucketStatsList));\r
+            bucketStatsList.clear();\r
+            groupStatsList.add(groupStatsBuilder.build());\r
+        }\r
+        builder.setGroupStats(new ArrayList<>(groupStatsList));\r
+        groupStatsList.clear();\r
+        return builder.build();\r
+    }\r
+    \r
+    private static MultipartReplyMeterFeatures setMeterFeatures(ByteBuf input) {\r
+        final byte PADDING_IN_METER_FEATURES_HEADER = 2;\r
+        MultipartReplyMeterFeaturesBuilder builder = new MultipartReplyMeterFeaturesBuilder();\r
+        builder.setMaxMeter(input.readUnsignedInt());\r
+        builder.setBandTypes(MeterBandType.forValue(input.readInt()));\r
+        builder.setCapabilities(decodeMeterModFlags((int) input.readUnsignedInt()));\r
+        builder.setMaxBands(input.readUnsignedByte());\r
+        builder.setMaxColor(input.readUnsignedByte());\r
+        input.skipBytes(PADDING_IN_METER_FEATURES_HEADER);\r
+        return builder.build();\r
+    }\r
+    \r
+    private static MeterFlags decodeMeterModFlags(int input){\r
+        final Boolean _oFPMFKBPS = (input & (1 << 0)) > 0;\r
+        final Boolean _oFPMFPKTPS = (input & (1 << 1)) > 0;\r
+        final Boolean _oFPMFBURST = (input & (1 << 2)) > 0; \r
+        final Boolean _oFPMFSTATS = (input & (1 << 3)) > 0;\r
+        return new MeterFlags(_oFPMFBURST, _oFPMFKBPS, _oFPMFPKTPS, _oFPMFSTATS);\r
+    }\r
+    \r
+    private static MultipartReplyMeter setMeter(ByteBuf input) {\r
+        final byte PADDING_IN_METER_STATS_HEADER = 6;\r
+        final byte METER_BAND_STATS_LENGTH = 16;\r
+        final byte METER_BODY_LENGTH = 40;\r
+        int actualLength;\r
+        MultipartReplyMeterBuilder builder = new MultipartReplyMeterBuilder();\r
+        List<MeterStats> meterStatsList = new ArrayList<>();\r
+        MeterStatsBuilder meterStatsBuilder = new MeterStatsBuilder();\r
+        List<MeterBandStats> meterBandStatsList = new ArrayList<>();\r
+        MeterBandStatsBuilder meterBandStatsBuilder = new MeterBandStatsBuilder();\r
+        while (input.readableBytes() > 0) {\r
+            meterStatsBuilder.setMeterId(input.readUnsignedInt());\r
+            actualLength = 0;\r
+            int meterStatsBodyLength = input.readUnsignedShort();\r
+            input.skipBytes(PADDING_IN_METER_STATS_HEADER);\r
+            meterStatsBuilder.setFlowCount(input.readUnsignedInt());\r
+            byte[] packetInCount = new byte[Long.SIZE/Byte.SIZE];\r
+            input.readBytes(packetInCount);\r
+            meterStatsBuilder.setPacketInCount(new BigInteger(packetInCount));\r
+            byte[] byteInCount = new byte[Long.SIZE/Byte.SIZE];\r
+            input.readBytes(byteInCount);\r
+            meterStatsBuilder.setByteInCount(new BigInteger(byteInCount));\r
+            meterStatsBuilder.setDurationSec(input.readUnsignedInt());\r
+            meterStatsBuilder.setDurationNsec(input.readUnsignedInt());\r
+            actualLength = METER_BODY_LENGTH;\r
+            \r
+            while (actualLength < meterStatsBodyLength) {\r
+                byte[] packetBandCount = new byte[Long.SIZE/Byte.SIZE];\r
+                input.readBytes(packetBandCount);\r
+                meterBandStatsBuilder.setPacketBandCount(new BigInteger(packetBandCount));\r
+                byte[] byteBandCount = new byte[Long.SIZE/Byte.SIZE];\r
+                input.readBytes(byteBandCount);\r
+                meterBandStatsBuilder.setByteBandCount(new BigInteger(byteBandCount));\r
+                \r
+                meterBandStatsList.add(meterBandStatsBuilder.build());\r
+                actualLength = actualLength + METER_BAND_STATS_LENGTH;\r
+            }\r
+        \r
+            meterStatsBuilder.setMeterBandStats(new ArrayList<>(meterBandStatsList));\r
+            meterBandStatsList.clear();\r
+            meterStatsList.add(meterStatsBuilder.build());\r
+        }\r
+        builder.setMeterStats(new ArrayList<>(meterStatsList));\r
+        meterStatsList.clear();\r
+        return builder.build();\r
+    }\r
+    \r
+    private static MultipartReplyMeterConfig setMeterConfig(ByteBuf input) {\r
+        final byte METER_BAND_LENGTH = 16;\r
+        final byte METER_CONFIG_LENGTH = 8;\r
+        int actualLength;\r
+        MultipartReplyMeterConfigBuilder builder = new MultipartReplyMeterConfigBuilder();\r
+        List<MeterConfig> meterConfigList = new ArrayList<>();\r
+        MeterConfigBuilder meterConfigBuilder = new MeterConfigBuilder();\r
+        List<Bands> bandsList = new ArrayList<Bands>();\r
+        BandsBuilder bandsBuilder = new BandsBuilder();\r
+        \r
+        while (input.readableBytes() > 0) {\r
+            int meterConfigBodyLength = input.readUnsignedShort();\r
+            actualLength = 0;\r
+            meterConfigBuilder.setFlags(MeterModCommand.forValue(input.readUnsignedShort()));\r
+            meterConfigBuilder.setMeterId(input.readUnsignedInt());\r
+            actualLength = METER_CONFIG_LENGTH;\r
+            \r
+            while (actualLength < meterConfigBodyLength) {\r
+                MeterBandDropBuilder bandDropBuilder = new MeterBandDropBuilder();\r
+                final byte PADDING_IN_METER_BAND_DROP_HEADER = 4;\r
+                MeterBandDscpRemarkBuilder bandDscpRemarkBuilder = new MeterBandDscpRemarkBuilder();\r
+                final byte PADDING_IN_METER_BAND_DSCP_HEADER = 3;\r
+                MeterBandExperimenterBuilder bandExperimenterBuilder = new MeterBandExperimenterBuilder(); \r
+                int bandLen = 0;\r
+                int bandType = input.readUnsignedShort();\r
+                switch (bandType) {\r
+                    case 1: bandDropBuilder.setType(MeterBandType.forValue(bandType));\r
+                            bandLen = input.readUnsignedShort();\r
+                            bandDropBuilder.setRate(input.readUnsignedInt());\r
+                            bandDropBuilder.setBurstSize(input.readUnsignedInt());\r
+                            input.skipBytes(PADDING_IN_METER_BAND_DROP_HEADER);\r
+                            bandsBuilder.setMeterBand(bandDropBuilder.build());\r
+                            break;\r
+                    case 2: bandDscpRemarkBuilder.setType(MeterBandType.forValue(bandType));\r
+                            bandLen = input.readUnsignedShort();\r
+                            bandDscpRemarkBuilder.setRate(input.readUnsignedInt());\r
+                            bandDscpRemarkBuilder.setBurstSize(input.readUnsignedInt());\r
+                            bandDscpRemarkBuilder.setPrecLevel(input.readUnsignedByte());\r
+                            input.skipBytes(PADDING_IN_METER_BAND_DSCP_HEADER);\r
+                            bandsBuilder.setMeterBand(bandDscpRemarkBuilder.build());\r
+                            break;\r
+                    case 0xFFFF: bandExperimenterBuilder.setType(MeterBandType.forValue(bandType));\r
+                                 bandLen = input.readUnsignedShort();          \r
+                                 bandExperimenterBuilder.setRate(input.readUnsignedInt());\r
+                                 bandExperimenterBuilder.setBurstSize(input.readUnsignedInt());\r
+                                 bandExperimenterBuilder.setExperimenter(input.readUnsignedInt());\r
+                                 bandsBuilder.setMeterBand(bandExperimenterBuilder.build());\r
+                                 break;\r
+                    default: break;\r
+                }\r
+                bandsList.add(bandsBuilder.build());\r
+                actualLength = actualLength + METER_BAND_LENGTH;\r
+            }\r
+            meterConfigBuilder.setBands(new ArrayList<>(bandsList));\r
+            bandsList.clear();\r
+            meterConfigList.add(meterConfigBuilder.build());\r
         }\r
-        builder.setGroupStats(groupStatsList);\r
+        builder.setMeterConfig(new ArrayList<>(meterConfigList));\r
+        meterConfigList.clear();\r
+        return builder.build();\r
+    }\r
+    \r
+    private static MultipartReplyExperimenter setExperimenter(ByteBuf input) {\r
+        MultipartReplyExperimenterBuilder builder = new MultipartReplyExperimenterBuilder();\r
+        builder.setExperimenter(input.readUnsignedInt());\r
+        builder.setExpType(input.readUnsignedInt());\r
+        byte[] data = new byte[Long.SIZE/Byte.SIZE];\r
+        input.readBytes(data);\r
+        builder.setData(data);\r
         return builder.build();\r
     }\r
+    \r
+    private static MultipartReplyPortDesc setPortDesc(ByteBuf input) {\r
+        final byte PADDING_IN_PORT_DESC_HEADER_01 = 4;\r
+        final byte PADDING_IN_PORT_DESC_HEADER_02 = 2;\r
+        final int macAddressLength = 6;\r
+        final byte MAX_PORT_NAME_LEN = 16;\r
+        MultipartReplyPortDescBuilder builder = new MultipartReplyPortDescBuilder();\r
+        List<Ports> portsList = new ArrayList<>();\r
+        PortsBuilder portsBuilder = new PortsBuilder();\r
+        \r
+        while (input.readableBytes() > 0) {\r
+            portsBuilder.setPortNo(input.readUnsignedInt());\r
+            input.skipBytes(PADDING_IN_PORT_DESC_HEADER_01);\r
+            StringBuffer macToString = new StringBuffer();\r
+            for(int i=0; i<macAddressLength; i++){\r
+                short mac = 0;\r
+                mac = input.readUnsignedByte();\r
+                macToString.append(String.format("%02X", mac));\r
+            }\r
+            portsBuilder.setHwAddr(new MacAddress(macToString.toString()));\r
+            input.skipBytes(PADDING_IN_PORT_DESC_HEADER_02);\r
+            \r
+            byte[] portNameBytes = new byte[MAX_PORT_NAME_LEN];\r
+            input.readBytes(portNameBytes);\r
+            String portName = new String(portNameBytes);\r
+            portsBuilder.setName(portName.trim());\r
+            \r
+            portsBuilder.setConfig(createPortConfig(input.readUnsignedInt()));\r
+            portsBuilder.setState(createPortState(input.readUnsignedInt()));\r
+            portsBuilder.setCurrentFeatures(createPortFeatures(input.readUnsignedInt()));\r
+            portsBuilder.setAdvertisedFeatures(createPortFeatures(input.readUnsignedInt()));\r
+            portsBuilder.setSupportedFeatures(createPortFeatures(input.readUnsignedInt()));\r
+            portsBuilder.setPeerFeatures(createPortFeatures(input.readUnsignedInt()));\r
+            portsBuilder.setCurrSpeed(input.readUnsignedInt());\r
+            portsBuilder.setMaxSpeed(input.readUnsignedInt());\r
+            portsList.add(portsBuilder.build());\r
+        }\r
+        \r
+        builder.setPorts(new ArrayList<>(portsList));\r
+        portsList.clear();\r
+        return builder.build();\r
+    }\r
+    \r
+    private static PortConfig createPortConfig(long input){\r
+        final Boolean _portDown   = ((input) & (1<<0)) != 0;\r
+        final Boolean _noRecv    = ((input) & (1<<2)) != 0;\r
+        final Boolean _noFwd       = ((input) & (1<<5)) != 0;\r
+        final Boolean _noPacketIn = ((input) & (1<<6)) != 0;\r
+        return new PortConfig(_noFwd, _noPacketIn, _noRecv, _portDown);\r
+    }\r
+    \r
+    private static PortState createPortState(long input){\r
+        final Boolean _linkDown = ((input) & (1<<0)) != 0;\r
+        final Boolean _blocked  = ((input) & (1<<1)) != 0;\r
+        final Boolean _live     = ((input) & (1<<2)) != 0;\r
+        return new PortState(_linkDown, _blocked,_live);\r
+    }\r
+    \r
+    private static PortFeatures createPortFeatures(long input){\r
+        final Boolean _10mbHd = ((input) & (1<<0)) != 0;\r
+        final Boolean _10mbFd = ((input) & (1<<1)) != 0;\r
+        final Boolean _100mbHd = ((input) & (1<<2)) != 0;\r
+        final Boolean _100mbFd = ((input) & (1<<3)) != 0;\r
+        final Boolean _1gbHd = ((input) & (1<<4)) != 0;\r
+        final Boolean _1gbFd = ((input) & (1<<5)) != 0;\r
+        final Boolean _10gbFd = ((input) & (1<<6)) != 0;\r
+        final Boolean _40gbFd = ((input) & (1<<7)) != 0;\r
+        final Boolean _100gbFd = ((input) & (1<<8)) != 0;\r
+        final Boolean _1tbFd = ((input) & (1<<9)) != 0;\r
+        final Boolean _other = ((input) & (1<<10)) != 0;\r
+        final Boolean _copper = ((input) & (1<<11)) != 0;\r
+        final Boolean _fiber = ((input) & (1<<12)) != 0;\r
+        final Boolean _autoneg = ((input) & (1<<13)) != 0;\r
+        final Boolean _pause = ((input) & (1<<14)) != 0;\r
+        final Boolean _pauseAsym = ((input) & (1<<15)) != 0;\r
+        return new PortFeatures(_10mbHd, _10mbFd, _100mbHd, _100mbFd, _1gbHd, _1gbFd, _10gbFd,\r
+                _40gbFd, _100gbFd, _1tbFd, _other, _copper, _fiber, _autoneg, _pause, _pauseAsym);\r
+    }\r
 }\r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
index ef30ec046c2645d07216572900a9c7efa1ac12d1..2c5d851937b9d3bb6cc789baf62a50af63795b4f 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactory.java
@@ -9,7 +9,7 @@ import java.util.List;
 import org.opendaylight.openflowjava.protocol.impl.serialization.OFSerializer;\r
 import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInput;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.group.mod.Buckets;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.group.mod.BucketsList;\r
 \r
 /**\r
  * @author timotej.kubas\r
@@ -43,7 +43,7 @@ public class GroupModInputMessageFactory implements OFSerializer<GroupModInput>
         out.writeByte(message.getType().getIntValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_GROUP_MOD_MESSAGE, out);\r
         out.writeInt(message.getGroupId().intValue());\r
-        encodeBuckets(message.getBuckets(), out);\r
+        encodeBuckets(message.getBucketsList(), out);\r
     }\r
 \r
     @Override\r
@@ -56,11 +56,11 @@ public class GroupModInputMessageFactory implements OFSerializer<GroupModInput>
         return MESSAGE_TYPE;\r
     }\r
     \r
-    private static void encodeBuckets(List<Buckets> buckets, ByteBuf outBuffer) {\r
+    private static void encodeBuckets(List<BucketsList> buckets, ByteBuf outBuffer) {\r
         final byte PADDING_IN_BUCKET = 4;\r
         \r
-        for (Iterator<Buckets> iterator = buckets.iterator(); iterator.hasNext();) {\r
-            Buckets currentBucket = iterator.next();\r
+        for (Iterator<BucketsList> iterator = buckets.iterator(); iterator.hasNext();) {\r
+            BucketsList currentBucket = iterator.next();\r
             // TODO get method for field length missing\r
             outBuffer.writeShort(currentBucket.getWeight().intValue());\r
             outBuffer.writeInt(currentBucket.getWatchPort().getValue().intValue());\r

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 fda59e66699274534ef5636b42da9cd484f539e7..af700bbba83467e99733d71ff6e6c37b253728f8 100644 (file)
--- 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
@@ -9,12 +9,25 @@ import org.junit.Assert;
 import org.junit.Test;\r
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;\r
 import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;\r
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModFlags;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterFlags;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortConfig;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortState;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.MultipartReplyMessage;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDrop;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandDscpRemark;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.meter.band.header.meter.band.MeterBandExperimenter;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyAggregate;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyDesc;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyExperimenter;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyFlow;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyGroup;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeter;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterConfig;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyMeterFeatures;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortDesc;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyPortStats;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyQueue;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.multipart.reply.multipart.reply.body.MultipartReplyTable;\r
@@ -98,6 +111,7 @@ public class MultipartReplyMessageFactoryTest {
     @Test\r
     public void testMultipartReplyFlowBody(){\r
         ByteBuf bb = BufferHelper.buildBuffer("00 01 00 01 00 00 00 00 "+\r
+                                              "00 0C "+//length\r
                                               "08 "+//tableId\r
                                               "00 "+//pad_01\r
                                               "00 00 00 09 "+//durationSec\r
@@ -395,4 +409,442 @@ public class MultipartReplyMessageFactoryTest {
                 new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
                 message.getGroupStats().get(1).getBucketStats().get(1).getByteCount());\r
     }\r
+    \r
+    /**\r
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
+     */\r
+    @Test\r
+    public void testMultipartReplyMeterFeaturesBody(){\r
+        ByteBuf bb = BufferHelper.buildBuffer("00 0B 00 01 00 00 00 00 "+\r
+                                              "00 00 00 09 "+//maxMeter\r
+                                              "00 00 00 01 "+//bandTypes\r
+                                              "00 00 00 03 "+//capabilities\r
+                                              "03 "+//maxBands\r
+                                              "04 "+//maxColor\r
+                                              "00 00"//pad\r
+                                              );\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 11, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyMeterFeatures message = (MultipartReplyMeterFeatures) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong maxMeter", 9, message.getMaxMeter().intValue());\r
+        Assert.assertEquals("Wrong bandTypes", 1, message.getBandTypes().getIntValue());\r
+        Assert.assertEquals("Wrong capabilities", new MeterFlags(false, true, true, false), \r
+                                                      message.getCapabilities());\r
+        Assert.assertEquals("Wrong maxBands", 3, message.getMaxBands().intValue());\r
+        Assert.assertEquals("Wrong maxColor", 4, message.getMaxColor().intValue());\r
+    }\r
+    \r
+    /**\r
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
+     */\r
+    @Test\r
+    public void testMultipartReplyMeterBody(){\r
+        ByteBuf bb = BufferHelper.buildBuffer("00 09 00 01 00 00 00 00 "+\r
+                                              "00 00 00 09 "+//meterId\r
+                                              "00 58 "+//len\r
+                                              "00 00 00 00 00 00 "+//pad\r
+                                              "00 00 00 07 "+//flowCount\r
+                                              "00 01 01 01 01 01 01 01 "+//packetInCount\r
+                                              "00 01 01 01 01 01 01 01 "+//byteInCount\r
+                                              "00 00 00 05 "+//durationSec\r
+                                              "00 00 00 05 "+//durationNsec\r
+                                              "00 01 01 01 01 01 01 01 "+//packetBandCount_01\r
+                                              "00 01 01 01 01 01 01 01 "+//byteBandCount_01\r
+                                              "00 02 02 02 02 02 02 02 "+//packetBandCount_02\r
+                                              "00 02 02 02 02 02 02 02 "+//byteBandCount_02\r
+                                              "00 03 03 03 03 03 03 03 "+//packetBandCount_03\r
+                                              "00 03 03 03 03 03 03 03"//byteBandCount_03\r
+                                              );\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyMeter message = (MultipartReplyMeter) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong meterId", 9, \r
+                             message.getMeterStats().get(0).getMeterId().intValue());\r
+        Assert.assertEquals("Wrong flowCount", 7, \r
+                            message.getMeterStats().get(0).getFlowCount().intValue());\r
+        Assert.assertEquals("Wrong packetInCount", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getPacketInCount());\r
+        Assert.assertEquals("Wrong byteInCount", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getByteInCount());\r
+        Assert.assertEquals("Wrong durationSec", 5, \r
+                message.getMeterStats().get(0).getDurationSec().intValue());\r
+        Assert.assertEquals("Wrong durationNsec", 5, \r
+                message.getMeterStats().get(0).getDurationNsec().intValue());\r
+        Assert.assertEquals("Wrong packetBandCount_01", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_01", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount());\r
+        Assert.assertEquals("Wrong packetBandCount_02", \r
+                new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_02", \r
+                new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount());\r
+        Assert.assertEquals("Wrong packetBandCount_03", \r
+                new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_03", \r
+                new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());\r
+    }\r
+    \r
+    @Test\r
+    public void testMultipartReplyMeterBodyMulti(){\r
+        ByteBuf bb = BufferHelper.buildBuffer("00 09 00 01 00 00 00 00 "+\r
+                                              "00 00 00 09 "+//meterId_0\r
+                                              "00 58 "+//len_0\r
+                                              "00 00 00 00 00 00 "+//pad_0\r
+                                              "00 00 00 07 "+//flowCount_0\r
+                                              "00 01 01 01 01 01 01 01 "+//packetInCount_0\r
+                                              "00 01 01 01 01 01 01 01 "+//byteInCount_0\r
+                                              "00 00 00 05 "+//durationSec_0\r
+                                              "00 00 00 05 "+//durationNsec_0\r
+                                              "00 01 01 01 01 01 01 01 "+//packetBandCount_01\r
+                                              "00 01 01 01 01 01 01 01 "+//byteBandCount_01\r
+                                              "00 02 02 02 02 02 02 02 "+//packetBandCount_02\r
+                                              "00 02 02 02 02 02 02 02 "+//byteBandCount_02\r
+                                              "00 03 03 03 03 03 03 03 "+//packetBandCount_03\r
+                                              "00 03 03 03 03 03 03 03 "+//byteBandCount_03\r
+                                              "00 00 00 08 "+//meterId_1\r
+                                              "00 58 "+//len_1\r
+                                              "00 00 00 00 00 00 "+//pad_1\r
+                                              "00 00 00 07 "+//flowCount_1\r
+                                              "00 01 01 01 01 01 01 01 "+//packetInCount_1\r
+                                              "00 01 01 01 01 01 01 01 "+//byteInCount_1\r
+                                              "00 00 00 05 "+//durationSec_1\r
+                                              "00 00 00 05 "+//durationNsec_1\r
+                                              "00 01 01 01 01 01 01 01 "+//packetBandCount_11\r
+                                              "00 01 01 01 01 01 01 01 "+//byteBandCount_11\r
+                                              "00 02 02 02 02 02 02 02 "+//packetBandCount_12\r
+                                              "00 02 02 02 02 02 02 02 "+//byteBandCount_12\r
+                                              "00 03 03 03 03 03 03 03 "+//packetBandCount_13\r
+                                              "00 03 03 03 03 03 03 03"//byteBandCount_13\r
+                                              );\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 9, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyMeter message = (MultipartReplyMeter) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong meterId", 9, \r
+                             message.getMeterStats().get(0).getMeterId().intValue());\r
+        Assert.assertEquals("Wrong flowCount", 7, \r
+                            message.getMeterStats().get(0).getFlowCount().intValue());\r
+        Assert.assertEquals("Wrong packetInCount", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getPacketInCount());\r
+        Assert.assertEquals("Wrong byteInCount", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getByteInCount());\r
+        Assert.assertEquals("Wrong durationSec", 5, \r
+                message.getMeterStats().get(0).getDurationSec().intValue());\r
+        Assert.assertEquals("Wrong durationNsec", 5, \r
+                message.getMeterStats().get(0).getDurationNsec().intValue());\r
+        Assert.assertEquals("Wrong packetBandCount_01", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(0).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_01", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(0).getByteBandCount());\r
+        Assert.assertEquals("Wrong packetBandCount_02", \r
+                new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(1).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_02", \r
+                new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(1).getByteBandCount());\r
+        Assert.assertEquals("Wrong packetBandCount_03", \r
+                new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(2).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_03", \r
+                new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), \r
+                message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());\r
+        \r
+        Assert.assertEquals("Wrong meterId", 8, \r
+                message.getMeterStats().get(1).getMeterId().intValue());\r
+        Assert.assertEquals("Wrong flowCount", 7, \r
+                message.getMeterStats().get(1).getFlowCount().intValue());\r
+        Assert.assertEquals("Wrong packetInCount", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(1).getPacketInCount());\r
+        Assert.assertEquals("Wrong byteInCount", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(1).getByteInCount());\r
+        Assert.assertEquals("Wrong durationSec", 5, \r
+                message.getMeterStats().get(1).getDurationSec().intValue());\r
+        Assert.assertEquals("Wrong durationNsec", 5, \r
+                message.getMeterStats().get(1).getDurationNsec().intValue());\r
+        Assert.assertEquals("Wrong packetBandCount_01", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(1).getMeterBandStats().get(0).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_01", \r
+                new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
+                message.getMeterStats().get(1).getMeterBandStats().get(0).getByteBandCount());\r
+        Assert.assertEquals("Wrong packetBandCount_02", \r
+                new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
+                message.getMeterStats().get(1).getMeterBandStats().get(1).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_02", \r
+                new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
+                message.getMeterStats().get(1).getMeterBandStats().get(1).getByteBandCount());\r
+        Assert.assertEquals("Wrong packetBandCount_03", \r
+                new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), \r
+                message.getMeterStats().get(1).getMeterBandStats().get(2).getPacketBandCount());\r
+        Assert.assertEquals("Wrong byteBandCount_03", \r
+                new BigInteger(new byte[]{0x00, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03}), \r
+                message.getMeterStats().get(1).getMeterBandStats().get(2).getByteBandCount());\r
+    }\r
+    \r
+    /**\r
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
+     */\r
+    @Test\r
+    public void testMultipartReplyMeterConfigBody(){\r
+        ByteBuf bb = BufferHelper.buildBuffer("00 0A 00 01 00 00 00 00 "+\r
+                                              "00 38 "+//len\r
+                                              "00 01 "+//flags\r
+                                              "00 00 00 09 "+//meterId\r
+                                              "00 01 "+//meterBandDrop.type\r
+                                              "00 10 "+//meterBandDrop.len\r
+                                              "00 00 00 11 "+//meterBandDrop.rate\r
+                                              "00 00 00 20 "+//meterBandDrop.burstSize\r
+                                              "00 00 00 00 "+//meterBandDrop.pad\r
+                                              "00 02 "+//meterBandDscp.type\r
+                                              "00 10 "+//meterBandDscp.len\r
+                                              "00 00 00 11 "+//meterBandDscp.rate\r
+                                              "00 00 00 20 "+//meterBandDscp.burstSize\r
+                                              "04 "+//meterBandDscp.precLevel\r
+                                              "00 00 00 "+//meterBandDscp.pad\r
+                                              "FF FF "+//meterBandExperimenter.type\r
+                                              "00 10 "+//meterBandExperimenter.len\r
+                                              "00 00 00 11 "+//meterBandExperimenter.rate\r
+                                              "00 00 00 20 "+//meterBandExperimenter.burstSize\r
+                                              "00 00 00 04"//meterBandExperimenter.experimenter\r
+                                              );\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyMeterConfig message = (MultipartReplyMeterConfig) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong flags", 1, \r
+                             message.getMeterConfig().get(0).getFlags().getIntValue());\r
+        Assert.assertEquals("Wrong meterId", 9, \r
+                             message.getMeterConfig().get(0).getMeterId().intValue());\r
+        \r
+        MeterBandDrop meterBandDrop = (MeterBandDrop) message.getMeterConfig().get(0).getBands().get(0).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandDrop.type", 1, meterBandDrop.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandDrop.rate", 17, meterBandDrop.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandDrop.burstSize", 32, meterBandDrop.getBurstSize().intValue());\r
+        \r
+        MeterBandDscpRemark meterBandDscp = (MeterBandDscpRemark) message.getMeterConfig().get(0).getBands().get(1).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandDscp.type", 2, meterBandDscp.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandDscp.rate", 17, meterBandDscp.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandDscp.burstSize", 32, meterBandDscp.getBurstSize().intValue());\r
+        Assert.assertEquals("Wrong meterBandDscp.precLevel", 4, meterBandDscp.getPrecLevel().intValue());\r
+        \r
+        MeterBandExperimenter meterBandExperimenter = (MeterBandExperimenter) message.getMeterConfig().get(0).getBands().get(2).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandExperimenter.type", 0xFFFF, meterBandExperimenter.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandExperimenter.rate", 17, meterBandExperimenter.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandExperimenter.burstSize", 32, meterBandExperimenter.getBurstSize().intValue());\r
+        Assert.assertEquals("Wrong meterBandExperimenter.experimenter", 4, meterBandExperimenter.getExperimenter().intValue());\r
+    }\r
+    \r
+    /**\r
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
+     */\r
+    @Test\r
+    public void testMultipartReplyMeterConfigBodyMulti(){\r
+        ByteBuf bb = BufferHelper.buildBuffer("00 0A 00 01 00 00 00 00 "+\r
+                                              "00 38 "+//len\r
+                                              "00 01 "+//flags\r
+                                              "00 00 00 09 "+//meterId\r
+                                              "00 01 "+//meterBandDrop.type\r
+                                              "00 10 "+//meterBandDrop.len\r
+                                              "00 00 00 11 "+//meterBandDrop.rate\r
+                                              "00 00 00 20 "+//meterBandDrop.burstSize\r
+                                              "00 00 00 00 "+//meterBandDrop.pad\r
+                                              "00 02 "+//meterBandDscp.type\r
+                                              "00 10 "+//meterBandDscp.len\r
+                                              "00 00 00 11 "+//meterBandDscp.rate\r
+                                              "00 00 00 20 "+//meterBandDscp.burstSize\r
+                                              "04 "+//meterBandDscp.precLevel\r
+                                              "00 00 00 "+//meterBandDscp.pad\r
+                                              "FF FF "+//meterBandExperimenter.type\r
+                                              "00 10 "+//meterBandExperimenter.len\r
+                                              "00 00 00 11 "+//meterBandExperimenter.rate\r
+                                              "00 00 00 20 "+//meterBandExperimenter.burstSize\r
+                                              "00 00 00 04 "+//meterBandExperimenter.experimenter\r
+                                              \r
+                                              "00 18 "+//len01\r
+                                              "00 00 "+//flags01\r
+                                              "00 00 00 07 "+//meterId01\r
+                                              "00 02 "+//meterBandDscp01.type\r
+                                              "00 10 "+//meterBandDscp01.len\r
+                                              "00 00 00 11 "+//meterBandDscp01.rate\r
+                                              "00 00 00 20 "+//meterBandDscp01.burstSize\r
+                                              "04 "+//meterBandDscp01.precLevel\r
+                                              "00 00 00"//meterBandDscp01.pad\r
+                                              );\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 10, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyMeterConfig message = (MultipartReplyMeterConfig) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong flags", 1, \r
+                             message.getMeterConfig().get(0).getFlags().getIntValue());\r
+        Assert.assertEquals("Wrong meterId", 9, \r
+                             message.getMeterConfig().get(0).getMeterId().intValue());\r
+        \r
+        MeterBandDrop meterBandDrop = (MeterBandDrop) message.getMeterConfig().get(0).getBands().get(0).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandDrop.type", 1, meterBandDrop.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandDrop.rate", 17, meterBandDrop.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandDrop.burstSize", 32, meterBandDrop.getBurstSize().intValue());\r
+        \r
+        MeterBandDscpRemark meterBandDscp = (MeterBandDscpRemark) message.getMeterConfig().get(0).getBands().get(1).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandDscp.type", 2, meterBandDscp.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandDscp.rate", 17, meterBandDscp.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandDscp.burstSize", 32, meterBandDscp.getBurstSize().intValue());\r
+        Assert.assertEquals("Wrong meterBandDscp.precLevel", 4, meterBandDscp.getPrecLevel().intValue());\r
+        \r
+        MeterBandExperimenter meterBandExperimenter = (MeterBandExperimenter) message.getMeterConfig().get(0).getBands().get(2).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandExperimenter.type", 0xFFFF, meterBandExperimenter.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandExperimenter.rate", 17, meterBandExperimenter.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandExperimenter.burstSize", 32, meterBandExperimenter.getBurstSize().intValue());\r
+        Assert.assertEquals("Wrong meterBandExperimenter.experimenter", 4, meterBandExperimenter.getExperimenter().intValue());\r
+        \r
+        Assert.assertEquals("Wrong flags01", 1, \r
+                             message.getMeterConfig().get(0).getFlags().getIntValue());\r
+        Assert.assertEquals("Wrong meterId01", 7, \r
+                             message.getMeterConfig().get(1).getMeterId().intValue());\r
+        \r
+        MeterBandDscpRemark meterBandDscp01 = (MeterBandDscpRemark) message.getMeterConfig().get(1).getBands().get(0).getMeterBand(); \r
+        Assert.assertEquals("Wrong meterBandDscp01.type", 2, meterBandDscp01.getType().getIntValue()); \r
+        Assert.assertEquals("Wrong meterBandDscp01.rate", 17, meterBandDscp01.getRate().intValue());\r
+        Assert.assertEquals("Wrong meterBandDscp01.burstSize", 32, meterBandDscp01.getBurstSize().intValue());\r
+        Assert.assertEquals("Wrong meterBandDscp01.precLevel", 4, meterBandDscp01.getPrecLevel().intValue());\r
+        \r
+    }\r
+    \r
+    /**\r
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
+     */\r
+    @Test\r
+    public void testMultipartReplyExperimenterBody(){\r
+        ByteBuf bb = BufferHelper.buildBuffer("FF FF 00 01 00 00 00 00 "+\r
+                                              "00 00 00 0F "+//experimenterId\r
+                                              "00 00 00 FF "+//expType\r
+                                              "00 00 01 01 00 00 01 01"\r
+                                              );\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 0xFFFF, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyExperimenter message = (MultipartReplyExperimenter) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong experimenterId", 15, message.getExperimenter().intValue());\r
+        Assert.assertEquals("Wrong expType", 255, message.getExpType().intValue());\r
+        Assert.assertArrayEquals("Wrong data", new byte[]{0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01}, \r
+                             message.getData());\r
+    }\r
+    \r
+    /**\r
+     * Testing {@link MultipartReplyMessageFactory} for correct translation into POJO\r
+     */\r
+    @Test\r
+    public void testMultipartReplyPortDescBody(){\r
+        final byte MAX_PORT_NAME_LEN = 16;\r
+        ByteBuf bb = BufferHelper.buildBuffer("00 0D 00 01 00 00 00 00 "+\r
+                                              "00 01 02 03 "+ //portNo\r
+                                              "00 00 00 00 "+ //padding01\r
+                                              "08 00 27 00 B0 EB " + //mac address\r
+                                              "00 00 "); //padding02\r
+        //port name\r
+        String portName = "SampleText";\r
+        byte[] portNameBytes = new byte[MAX_PORT_NAME_LEN];\r
+        portNameBytes = portName.getBytes();\r
+        bb.writeBytes(portNameBytes);\r
+        ByteBufUtils.padBuffer((MAX_PORT_NAME_LEN - portNameBytes.length), bb);\r
+        \r
+        ByteBuf bb2 =  BufferHelper.buildBuffer("00 00 00 41 " + //port config\r
+                                                "00 00 00 05 " + //port state\r
+                                                "00 00 00 81 " + //current features\r
+                                                "00 00 00 81 " + //advertised features\r
+                                                "00 00 00 81 " + //supported features\r
+                                                "00 00 00 81 " + //peer features\r
+                                                "00 00 00 81 " + //curr speed\r
+                                                "00 00 00 80" //max speed\r
+                                                );\r
+        bb.writeBytes(bb2.copy(4, bb2.readableBytes()-4));//excluding version and xid\r
+        \r
+        MultipartReplyMessage builtByFactory = BufferHelper.decodeV13(MultipartReplyMessageFactory.getInstance(), bb);\r
+        \r
+        BufferHelper.checkHeaderV13(builtByFactory);\r
+        Assert.assertEquals("Wrong type", 13, builtByFactory.getType().getIntValue());\r
+        Assert.assertEquals("Wrong flag", true, builtByFactory.getFlags().isOFPMPFREQMORE());\r
+        \r
+        MultipartReplyPortDesc message = (MultipartReplyPortDesc) builtByFactory.getMultipartReplyBody();\r
+        \r
+        Assert.assertEquals("Wrong portNo", 66051L, message.getPorts().get(0).getPortNo().longValue());\r
+        Assert.assertEquals("Wrong macAddress", new MacAddress("08002700B0EB"), \r
+                                                message.getPorts().get(0).getHwAddr());\r
+        Assert.assertEquals("Wrong portName", "SampleText", \r
+                                                message.getPorts().get(0).getName());\r
+        Assert.assertEquals("Wrong portConfig", new PortConfig(false, true, false, true), \r
+                                                message.getPorts().get(0).getConfig());\r
+        Assert.assertEquals("Wrong portState", new PortState(true, false, true), \r
+                                               message.getPorts().get(0).getState());\r
+        Assert.assertEquals("Wrong currentFeatures", new PortFeatures(true, false, false, false,\r
+                                                                      false, false, false, true, \r
+                                                                      false, false, false, false, \r
+                                                                      false, false, false, false), \r
+                                                  message.getPorts().get(0).getCurrentFeatures());\r
+        Assert.assertEquals("Wrong advertisedFeatures", \r
+                             new PortFeatures(true, false, false, false,\r
+                                              false, false, false, true, \r
+                                              false, false, false, false, \r
+                                              false, false, false, false), \r
+                                              message.getPorts().get(0).getAdvertisedFeatures());\r
+        Assert.assertEquals("Wrong supportedFeatures", \r
+                             new PortFeatures(true, false, false, false,\r
+                                              false, false, false, true, \r
+                                              false, false, false, false, \r
+                                              false, false, false, false), \r
+                                              message.getPorts().get(0).getSupportedFeatures());\r
+        Assert.assertEquals("Wrong peerFeatures", \r
+                             new PortFeatures(true, false, false, false,\r
+                                              false, false, false, true, \r
+                                              false, false, false, false, \r
+                                              false, false, false, false), \r
+                                              message.getPorts().get(0).getPeerFeatures());\r
+        Assert.assertEquals("Wrong currSpeed", 129L, message.getPorts().get(0).getCurrSpeed().longValue());\r
+        Assert.assertEquals("Wrong maxSpeed", 128L, message.getPorts().get(0).getMaxSpeed().longValue());\r
+    }\r
 }\r

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
index bf95ea188556d0bac03d599c1eedc98f8a7eb9d5..771aae2376deac56823bed1c66b9baa7b175714f 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/PortStatusMessageFactoryTest.java
@@ -48,16 +48,16 @@ public class PortStatusMessageFactoryTest {
         Assert.assertEquals("Wrong macAddress", new MacAddress("08002700B0EB"), builtByFactory.getHwAddr());\r
         Assert.assertEquals("Wrong portConfig", new PortConfig(false, true, false, true), builtByFactory.getConfig());\r
         Assert.assertEquals("Wrong portState", new PortState(true, false, true), builtByFactory.getState());\r
-        Assert.assertEquals("Wrong portFeatures", new PortFeatures(true, false, false, false,\r
+        Assert.assertEquals("Wrong currentFeatures", new PortFeatures(true, false, false, false,\r
                                              false, false, false, true, false, false, false, false, \r
                                              false, false, false, false), builtByFactory.getCurrentFeatures());\r
-        Assert.assertEquals("Wrong portFeatures", new PortFeatures(true, false, false, false,\r
+        Assert.assertEquals("Wrong advertisedFeatures", new PortFeatures(true, false, false, false,\r
                                              false, false, false, true, false, false, false, false, \r
                                              false, false, false, false), builtByFactory.getAdvertisedFeatures());\r
-        Assert.assertEquals("Wrong portFeatures", new PortFeatures(true, false, false, false,\r
+        Assert.assertEquals("Wrong supportedFeatures", new PortFeatures(true, false, false, false,\r
                                              false, false, false, true, false, false, false, false, \r
                                              false, false, false, false), builtByFactory.getSupportedFeatures());\r
-        Assert.assertEquals("Wrong portFeatures", new PortFeatures(true, false, false, false,\r
+        Assert.assertEquals("Wrong peerFeatures", new PortFeatures(true, false, false, false,\r
                                              false, false, false, true, false, false, false, false, \r
                                              false, false, false, false), builtByFactory.getSupportedFeatures());\r
         Assert.assertEquals("Wrong currSpeed", 129L, builtByFactory.getCurrSpeed().longValue());\r

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java
index bb6ab99916126075c2ba0c34832e1aec5898b25a..d2162da7c14ea04d28c9ed64a627f999b83b98a2 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/GroupModInputMessageFactoryTest.java
@@ -17,8 +17,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInput;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GroupModInputBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.group.mod.Buckets;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.group.mod.BucketsBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.group.mod.BucketsList;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.group.mod.BucketsListBuilder;\r
 \r
 /**\r
  * @author timotej.kubas\r
@@ -38,7 +38,7 @@ public class GroupModInputMessageFactoryTest {
         builder.setCommand(GroupModCommand.forValue(2));\r
         builder.setType(GroupType.forValue(3));\r
         builder.setGroupId(256L);\r
-        builder.setBuckets(createBucketsList());\r
+        builder.setBucketsList(createBucketsList());\r
         GroupModInput message = builder.build();\r
         \r
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
@@ -53,10 +53,10 @@ public class GroupModInputMessageFactoryTest {
         Assert.assertEquals("Wrong bucketList", createBucketsList(), createBucketsListFromBufer(out));\r
     }\r
     \r
-    private static List<Buckets> createBucketsList(){\r
-        List<Buckets> bucketsList = new ArrayList<>();\r
-        BucketsBuilder bucketsBuilder = new BucketsBuilder();\r
-        Buckets bucket;\r
+    private static List<BucketsList> createBucketsList(){\r
+        List<BucketsList> bucketsList = new ArrayList<>();\r
+        BucketsListBuilder bucketsBuilder = new BucketsListBuilder();\r
+        BucketsList bucket;\r
         bucketsBuilder.setWeight(10);\r
         bucketsBuilder.setWatchPort(new PortNumber(65L));\r
         bucketsBuilder.setWatchGroup(22L);\r
@@ -65,10 +65,10 @@ public class GroupModInputMessageFactoryTest {
         return bucketsList;\r
     }\r
     \r
-    private static List<Buckets> createBucketsListFromBufer(ByteBuf out){\r
-        List<Buckets> bucketsList = new ArrayList<>();\r
-        BucketsBuilder bucketsBuilder = new BucketsBuilder();\r
-        Buckets bucket;\r
+    private static List<BucketsList> createBucketsListFromBufer(ByteBuf out){\r
+        List<BucketsList> bucketsList = new ArrayList<>();\r
+        BucketsListBuilder bucketsBuilder = new BucketsListBuilder();\r
+        BucketsList bucket;\r
         bucketsBuilder.setWeight((int) out.readShort());\r
         bucketsBuilder.setWatchPort(new PortNumber(out.readUnsignedInt()));\r
         bucketsBuilder.setWatchGroup(out.readUnsignedInt());\r