GroupId and MeterId used in model (as requested)

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / MultipartRequestInputFactoryTest.java

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