GroupId and MeterId used in model (as requested)

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

diff --git a/openflow-protocol-api/src/main/yang/openflow-protocol.yang b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
index 576a8926d1f5d55829a3296e24e799f888cec0ab..ec5f76bd9983b4ad2b45e9c7ae1df5201f7a9b28 100644 (file)
--- a/openflow-protocol-api/src/main/yang/openflow-protocol.yang
+++ b/openflow-protocol-api/src/main/yang/openflow-protocol.yang
@@ -479,7 +479,7 @@ module openflow-protocol {
                     type oft:group-type;\r
                 }\r
                 leaf group-id {\r
-                    type uint32;\r
+                    type oft:group-id;\r
                 }\r
                 \r
                 uses buckets;\r
@@ -612,7 +612,7 @@ module openflow-protocol {
                     }\r
                     case multipart-request-group {\r
                         leaf group-id {\r
-                            type uint32;\r
+                            type oft:group-id;\r
                         }\r
                     }\r
                     case multipart-request-group-desc {\r
@@ -627,12 +627,12 @@ module openflow-protocol {
                     }\r
                     case multipart-request-meter {\r
                         leaf meter-id {\r
-                            type uint32;\r
+                            type oft:meter-id;\r
                         }\r
                     }\r
                     case multipart-request-meter-config {\r
                         leaf meter-id {\r
-                            type uint32;\r
+                            type oft:meter-id;\r
                         }\r
                     }\r
                     case multipart-request-meter-features {\r
@@ -861,7 +861,7 @@ module openflow-protocol {
                     case multipart-reply-group {\r
                         list group-stats {\r
                             leaf group-id {\r
-                                type uint32;\r
+                                type oft:group-id;\r
                             }\r
                             leaf ref-count {\r
                                 type uint32;\r
@@ -894,7 +894,7 @@ module openflow-protocol {
                                 type oft:group-type;\r
                             }\r
                             leaf group-id {\r
-                                type uint32;\r
+                                type oft:group-id;\r
                             }\r
                             uses buckets;\r
                         }\r
@@ -916,7 +916,7 @@ module openflow-protocol {
                     case multipart-reply-meter {\r
                         list meter-stats {\r
                             leaf meter-id {\r
-                                type uint32;\r
+                                type oft:meter-id;\r
                             }\r
                             leaf flow-count {\r
                                 type uint32;\r
@@ -949,7 +949,7 @@ module openflow-protocol {
                                 type oft:meter-flags;\r
                             }\r
                             leaf meter-id {\r
-                                type uint32;\r
+                                type oft:meter-id;\r
                             }\r
                             list bands {\r
                                 uses meter-band-header;\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 4bf6d21a8aaa13145a28be304e9806281e1b0b15..1ebff03675c253c4979b660d4e9cf922f8b2b8aa 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
@@ -30,11 +30,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.ActionType;\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.GroupCapabilities;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupTypes;\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.MeterBandTypeBitmap;\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.MeterId;\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
@@ -482,7 +484,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             GroupStatsBuilder groupStatsBuilder = new GroupStatsBuilder();\r
             int bodyLength = input.readUnsignedShort();\r
             input.skipBytes(PADDING_IN_GROUP_HEADER_01);\r
-            groupStatsBuilder.setGroupId(input.readUnsignedInt());\r
+            groupStatsBuilder.setGroupId(new GroupId(input.readUnsignedInt()));\r
             groupStatsBuilder.setRefCount(input.readUnsignedInt());\r
             input.skipBytes(PADDING_IN_GROUP_HEADER_02);\r
             byte[] packetCount = new byte[Long.SIZE/Byte.SIZE];\r
@@ -543,7 +545,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
         List<MeterStats> meterStatsList = new ArrayList<>();\r
         while (input.readableBytes() > 0) {\r
             MeterStatsBuilder meterStatsBuilder = new MeterStatsBuilder();\r
-            meterStatsBuilder.setMeterId(input.readUnsignedInt());\r
+            meterStatsBuilder.setMeterId(new MeterId(input.readUnsignedInt()));\r
             int meterStatsBodyLength = input.readUnsignedShort();\r
             input.skipBytes(PADDING_IN_METER_STATS_HEADER);\r
             meterStatsBuilder.setFlowCount(input.readUnsignedInt());\r
@@ -582,7 +584,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             MeterConfigBuilder meterConfigBuilder = new MeterConfigBuilder();\r
             int meterConfigBodyLength = input.readUnsignedShort();\r
             meterConfigBuilder.setFlags(createMeterFlags(input.readUnsignedShort()));\r
-            meterConfigBuilder.setMeterId(input.readUnsignedInt());\r
+            meterConfigBuilder.setMeterId(new MeterId(input.readUnsignedInt()));\r
             int actualLength = METER_CONFIG_LENGTH;\r
             List<Bands> bandsList = new ArrayList<>();\r
             while (actualLength < meterConfigBodyLength) {\r
@@ -769,7 +771,7 @@ public class MultipartReplyMessageFactory implements OFDeserializer<MultipartRep
             int bodyLength = input.readUnsignedShort();\r
             groupDescBuilder.setType(GroupType.forValue(input.readUnsignedByte()));\r
             input.skipBytes(PADDING_IN_GROUP_DESC_HEADER);\r
-            groupDescBuilder.setGroupId(input.readUnsignedInt());\r
+            groupDescBuilder.setGroupId(new GroupId(input.readUnsignedInt()));\r
             int actualLength = GROUP_DESC_HEADER_LENGTH;\r
             List<BucketsList> bucketsList = new ArrayList<>();\r
             while (actualLength < bodyLength) {\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 b60a7c29327e6b53389f0d6e8e0aa7d6da152caf..0f9b09ee304fa78f7897bf51da826668adbcd35d 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
@@ -45,7 +45,7 @@ public class GroupModInputMessageFactory implements OFSerializer<GroupModInput>
         out.writeShort(message.getCommand().getIntValue());\r
         out.writeByte(message.getType().getIntValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_GROUP_MOD_MESSAGE, out);\r
-        out.writeInt(message.getGroupId().intValue());\r
+        out.writeInt(message.getGroupId().getValue().intValue());\r
         encodeBuckets(message.getBucketsList(), out);\r
     }\r
 \r

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
index 51d952ac9b40308840e16299c51efc9dee558e51..5a17239b6213768c9a319bd52d6c1de267d17c04 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactory.java
@@ -338,19 +338,19 @@ public class MultipartRequestInputFactory implements OFSerializer<MultipartReque
 \r
     private static void encodeGroupStatsBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         MultipartRequestGroup groupStats = (MultipartRequestGroup) multipartRequestBody;\r
-        output.writeInt(groupStats.getGroupId().intValue());\r
+        output.writeInt(groupStats.getGroupId().getValue().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_GROUP_BODY, output);\r
     }\r
 \r
     private static void encodeMeterBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         MultipartRequestMeter meter = (MultipartRequestMeter) multipartRequestBody;\r
-        output.writeInt(meter.getMeterId().intValue());\r
+        output.writeInt(meter.getMeterId().getValue().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_METER_BODY, output);\r
     }\r
 \r
     private static void encodeMeterConfigBody(MultipartRequestBody multipartRequestBody, ByteBuf output) {\r
         MultipartRequestMeterConfig meterConfig = (MultipartRequestMeterConfig) multipartRequestBody;\r
-        output.writeInt(meterConfig.getMeterId().intValue());\r
+        output.writeInt(meterConfig.getMeterId().getValue().intValue());\r
         ByteBufUtils.padBuffer(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY, output);\r
     }\r
 \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 6f83ae0f5ed57ab6fe0af8750af79cd998a6a41f..4bf030797cde68dd7c92f700aaf9a1939f1ab119 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
@@ -397,7 +397,7 @@ public class MultipartReplyMessageFactoryTest {
         \r
         MultipartReplyGroup message = (MultipartReplyGroup) builtByFactory.getMultipartReplyBody();\r
         \r
-        Assert.assertEquals("Wrong groupId", 16, message.getGroupStats().get(0).getGroupId().intValue());\r
+        Assert.assertEquals("Wrong groupId", 16, message.getGroupStats().get(0).getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong refCount", 18, message.getGroupStats().get(0).getRefCount().intValue());\r
         Assert.assertEquals("Wrong packetCount", \r
                 new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
@@ -420,7 +420,7 @@ public class MultipartReplyMessageFactoryTest {
                 new BigInteger(new byte[]{0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02}), \r
                 message.getGroupStats().get(0).getBucketStats().get(1).getByteCount());\r
         \r
-        Assert.assertEquals("Wrong groupId_2", 16, message.getGroupStats().get(1).getGroupId().intValue());\r
+        Assert.assertEquals("Wrong groupId_2", 16, message.getGroupStats().get(1).getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong refCount_2", 18, message.getGroupStats().get(1).getRefCount().intValue());\r
         Assert.assertEquals("Wrong packetCount_2", \r
                 new BigInteger(new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01}), \r
@@ -505,7 +505,7 @@ public class MultipartReplyMessageFactoryTest {
         MultipartReplyMeter message = (MultipartReplyMeter) builtByFactory.getMultipartReplyBody();\r
         \r
         Assert.assertEquals("Wrong meterId", 9, \r
-                             message.getMeterStats().get(0).getMeterId().intValue());\r
+                             message.getMeterStats().get(0).getMeterId().getValue().intValue());\r
         Assert.assertEquals("Wrong flowCount", 7, \r
                             message.getMeterStats().get(0).getFlowCount().intValue());\r
         Assert.assertEquals("Wrong packetInCount", \r
@@ -583,7 +583,7 @@ public class MultipartReplyMessageFactoryTest {
         MultipartReplyMeter message = (MultipartReplyMeter) builtByFactory.getMultipartReplyBody();\r
         \r
         Assert.assertEquals("Wrong meterId", 9, \r
-                             message.getMeterStats().get(0).getMeterId().intValue());\r
+                             message.getMeterStats().get(0).getMeterId().getValue().intValue());\r
         Assert.assertEquals("Wrong flowCount", 7, \r
                             message.getMeterStats().get(0).getFlowCount().intValue());\r
         Assert.assertEquals("Wrong packetInCount", \r
@@ -616,7 +616,7 @@ public class MultipartReplyMessageFactoryTest {
                 message.getMeterStats().get(0).getMeterBandStats().get(2).getByteBandCount());\r
         \r
         Assert.assertEquals("Wrong meterId", 8, \r
-                message.getMeterStats().get(1).getMeterId().intValue());\r
+                message.getMeterStats().get(1).getMeterId().getValue().intValue());\r
         Assert.assertEquals("Wrong flowCount", 7, \r
                 message.getMeterStats().get(1).getFlowCount().intValue());\r
         Assert.assertEquals("Wrong packetInCount", \r
@@ -687,7 +687,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong flags", new MeterFlags(false, false, true, true),\r
                              message.getMeterConfig().get(0).getFlags());\r
         Assert.assertEquals("Wrong meterId", 9, \r
-                             message.getMeterConfig().get(0).getMeterId().intValue());\r
+                             message.getMeterConfig().get(0).getMeterId().getValue().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
@@ -755,7 +755,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong flags", new MeterFlags(true, false, true, false), \r
                              message.getMeterConfig().get(0).getFlags());\r
         Assert.assertEquals("Wrong meterId", 9, \r
-                             message.getMeterConfig().get(0).getMeterId().intValue());\r
+                             message.getMeterConfig().get(0).getMeterId().getValue().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
@@ -778,7 +778,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong flags01", new MeterFlags(false, true, true, false),\r
                              message.getMeterConfig().get(1).getFlags());\r
         Assert.assertEquals("Wrong meterId01", 7, \r
-                             message.getMeterConfig().get(1).getMeterId().intValue());\r
+                             message.getMeterConfig().get(1).getMeterId().getValue().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
@@ -925,7 +925,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong type", 1, \r
                              message.getGroupDesc().get(0).getType().getIntValue());\r
         Assert.assertEquals("Wrong groupId", 8, \r
-                             message.getGroupDesc().get(0).getGroupId().intValue());\r
+                             message.getGroupDesc().get(0).getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong bucketWeight", 6, \r
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());\r
         Assert.assertEquals("Wrong bucketWatchPort", 5, \r
@@ -1005,7 +1005,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong type", 1, \r
                              message.getGroupDesc().get(0).getType().getIntValue());\r
         Assert.assertEquals("Wrong groupId", 8, \r
-                             message.getGroupDesc().get(0).getGroupId().intValue());\r
+                             message.getGroupDesc().get(0).getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong bucketWeight", 6, \r
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());\r
         Assert.assertEquals("Wrong bucketWatchPort", 5, \r
@@ -1105,7 +1105,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong type", 1, \r
                              message.getGroupDesc().get(0).getType().getIntValue());\r
         Assert.assertEquals("Wrong groupId", 8, \r
-                             message.getGroupDesc().get(0).getGroupId().intValue());\r
+                             message.getGroupDesc().get(0).getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong bucketWeight", 6, \r
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());\r
         Assert.assertEquals("Wrong bucketWatchPort", 5, \r
@@ -1194,7 +1194,7 @@ public class MultipartReplyMessageFactoryTest {
         Assert.assertEquals("Wrong type", 1, \r
                              message.getGroupDesc().get(0).getType().getIntValue());\r
         Assert.assertEquals("Wrong groupId", 8, \r
-                             message.getGroupDesc().get(0).getGroupId().intValue());\r
+                             message.getGroupDesc().get(0).getGroupId().getValue().intValue());\r
         Assert.assertEquals("Wrong bucketWeight", 6, \r
                 message.getGroupDesc().get(0).getBucketsList().get(0).getWeight().intValue());\r
         Assert.assertEquals("Wrong bucketWatchPort", 5, \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 b90df4e3e5c589bbe257fef9f8ead4fdde094dbd..dbfada40b455d3af66eca6c4d1f9c8d287cb6993 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
@@ -12,6 +12,7 @@ import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.HelloMessageFactoryTest;\r
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;\r
 import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupModCommand;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;\r
@@ -37,7 +38,7 @@ public class GroupModInputMessageFactoryTest {
         BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);\r
         builder.setCommand(GroupModCommand.forValue(2));\r
         builder.setType(GroupType.forValue(3));\r
-        builder.setGroupId(256L);\r
+        builder.setGroupId(new GroupId(256L));\r
         List<BucketsList> exp = createBucketsList();\r
         builder.setBucketsList(exp);\r
         GroupModInput message = builder.build();\r
@@ -50,7 +51,7 @@ public class GroupModInputMessageFactoryTest {
         Assert.assertEquals("Wrong command", message.getCommand().getIntValue(), out.readUnsignedShort());\r
         Assert.assertEquals("Wrong type", message.getType().getIntValue(), out.readUnsignedByte());\r
         out.skipBytes(PADDING_IN_GROUP_MOD_MESSAGE);\r
-        Assert.assertEquals("Wrong groupId", message.getGroupId().intValue(), out.readUnsignedInt());\r
+        Assert.assertEquals("Wrong groupId", message.getGroupId().getValue().intValue(), out.readUnsignedInt());\r
         List<BucketsList> rec = createBucketsListFromBufer(out);\r
         Assert.assertArrayEquals("Wrong bucketList", exp.toArray(), rec.toArray());\r
     }\r

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java
index 45c70e319e0a3981b99c475a038316efd7a48589..e725e64b35c3bc47f40d0d859cd06a05cee72455 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/serialization/factories/MultipartRequestInputFactoryTest.java
@@ -14,6 +14,8 @@ import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.factories.HelloMessageFactoryTest;\r
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;\r
 import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupId;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterId;\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.TableConfig;\r
@@ -298,7 +300,7 @@ public class MultipartRequestInputFactoryTest {
 \r
     private static MultipartRequestGroup createRequestGroup() {\r
         MultipartRequestGroupBuilder builder = new MultipartRequestGroupBuilder();\r
-        builder.setGroupId(2258L);\r
+        builder.setGroupId(new GroupId(2258L));\r
         MultipartRequestGroup group = builder.build();\r
         return group;\r
     }\r
@@ -306,7 +308,7 @@ public class MultipartRequestInputFactoryTest {
     private static MultipartRequestGroup decodeRequestGroup(ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_GROUP_BODY = 4;\r
         MultipartRequestGroupBuilder builder = new MultipartRequestGroupBuilder();\r
-        builder.setGroupId(output.readUnsignedInt());\r
+        builder.setGroupId(new GroupId(output.readUnsignedInt()));\r
         output.skipBytes(PADDING_IN_MULTIPART_REQUEST_GROUP_BODY);\r
         MultipartRequestGroup group = builder.build();\r
         return group;\r
@@ -338,7 +340,7 @@ public class MultipartRequestInputFactoryTest {
 \r
     private static MultipartRequestMeter createRequestMeter() {\r
         MultipartRequestMeterBuilder builder = new MultipartRequestMeterBuilder();\r
-        builder.setMeterId(1121L);\r
+        builder.setMeterId(new MeterId(1121L));\r
         MultipartRequestMeter meter = builder.build();\r
         return meter;\r
     }\r
@@ -346,7 +348,7 @@ public class MultipartRequestInputFactoryTest {
     private static MultipartRequestMeter decodeRequestMeter(ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_METER_BODY = 4;\r
         MultipartRequestMeterBuilder builder = new MultipartRequestMeterBuilder();\r
-        builder.setMeterId(output.readUnsignedInt());\r
+        builder.setMeterId(new MeterId(output.readUnsignedInt()));\r
         output.skipBytes(PADDING_IN_MULTIPART_REQUEST_METER_BODY);\r
         MultipartRequestMeter meter = builder.build();\r
         return meter;\r
@@ -378,7 +380,7 @@ public class MultipartRequestInputFactoryTest {
 \r
     private static MultipartRequestMeterConfig createRequestMeterConfig() {\r
         MultipartRequestMeterConfigBuilder builder = new MultipartRequestMeterConfigBuilder();\r
-        builder.setMeterId(1133L);\r
+        builder.setMeterId(new MeterId(1133L));\r
         MultipartRequestMeterConfig meterConfig = builder.build();\r
         return meterConfig;\r
     }\r
@@ -386,7 +388,7 @@ public class MultipartRequestInputFactoryTest {
     private static MultipartRequestMeterConfig decodeRequestMeterConfig(ByteBuf output) {\r
         final byte PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY = 4;\r
         MultipartRequestMeterConfigBuilder builder = new MultipartRequestMeterConfigBuilder();\r
-        builder.setMeterId(output.readUnsignedInt());\r
+        builder.setMeterId(new MeterId(output.readUnsignedInt()));\r
         output.skipBytes(PADDING_IN_MULTIPART_REQUEST_METER_CONFIG_BODY);\r
         MultipartRequestMeterConfig meterConfig = builder.build();\r
         return meterConfig;\r