Add single layer deserialization support

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / multipart / MultipartReplyGroupDescDeserializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
index abd9df9c86a1f3f9a56b20d79c39c163e37d5739..14795a8c9637401878ed0058d5be2f23d6585060 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
@@ -53,6 +53,7 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
 
             message.skipBytes(PADDING_IN_GROUP_DESC_HEADER);
             itemBuilder.setGroupId(new GroupId(message.readUnsignedInt()));
+            itemBuilder.setKey(new GroupDescStatsKey(itemBuilder.getGroupId()));
 
             final List<Bucket> subItems = new ArrayList<>();
             int actualLength = GROUP_DESC_HEADER_LENGTH;
@@ -68,8 +69,6 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
                     .setWatchPort(message.readUnsignedInt())
                     .setWatchGroup(message.readUnsignedInt());
 
-                bucketKey++;
-
                 message.skipBytes(PADDING_IN_BUCKETS_HEADER);
                 final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list
                     .Action> actions = new ArrayList<>();
@@ -90,11 +89,11 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
 
                 bucketBuilder.setAction(actions);
                 subItems.add(bucketBuilder.build());
+                bucketKey++;
                 actualLength += bucketsLength;
             }
 
             items.add(itemBuilder
-                .setKey(new GroupDescStatsKey(itemBuilder.getGroupId()))
                 .setBuckets(new BucketsBuilder()
                     .setBucket(subItems)
                     .build())