Updated extension registration keys

[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / OF10ActionsSerializerTest.java

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java
index ebf9eb2c0e9481a9cb08fb6ff02527edac64e019..4a80e8c325f8c25ed9e4331953fc999d5c0d9a53 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF10ActionsSerializerTest.java
@@ -16,16 +16,14 @@ import java.util.List;
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;\r
-import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;\r
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;\r
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;\r
+import org.opendaylight.openflowjava.util.ByteBufUtils;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;\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.augments.rev131002.DlAddressAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DlAddressActionBuilder;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterAction;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterActionBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.IpAddressAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.IpAddressActionBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthAction;\r
@@ -41,7 +39,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidAction;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidActionBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Enqueue;\r
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetDlDst;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.SetDlSrc;\r
@@ -64,7 +61,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 public class OF10ActionsSerializerTest {\r
 \r
     private SerializerRegistry registry;\r
-    private OFSerializer<Action> actionSerializer;\r
 \r
     /**\r
      * Initializes serializer table and stores correct factory in field\r
@@ -73,8 +69,6 @@ public class OF10ActionsSerializerTest {
     public void startUp() {\r
         registry = new SerializerRegistryImpl();\r
         registry.init();\r
-        actionSerializer = registry.getSerializer(\r
-                new MessageTypeKey<>(EncodeConstants.OF10_VERSION_ID, Action.class));\r
     }\r
 \r
     /**\r
@@ -158,23 +152,10 @@ public class OF10ActionsSerializerTest {
         queueBuilder.setQueueId(400L);\r
         actionBuilder.addAugmentation(QueueIdAction.class, queueBuilder.build());\r
         actions.add(actionBuilder.build());\r
-        actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(Experimenter.class);\r
-        ExperimenterActionBuilder expBuilder = new ExperimenterActionBuilder();\r
-        expBuilder.setExperimenter(82L);\r
-        byte[] expData = new byte[]{0, 0, 0, 0, 0, 0, 0, 1};\r
-        expBuilder.setData(expData);\r
-        actionBuilder.addAugmentation(ExperimenterAction.class, expBuilder.build());\r
-        actions.add(actionBuilder.build());\r
-        actionBuilder = new ActionBuilder();\r
-        actionBuilder.setType(Experimenter.class);\r
-        expBuilder = new ExperimenterActionBuilder();\r
-        expBuilder.setExperimenter(102L);\r
-        actionBuilder.addAugmentation(ExperimenterAction.class, expBuilder.build());\r
-        actions.add(actionBuilder.build());\r
         \r
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
-        CodingUtils.serializeList(actions, actionSerializer, out);\r
+        ListSerializer.serializeList(actions, TypeKeyMakerFactory\r
+                .createActionKeyMaker(EncodeConstants.OF10_VERSION_ID), registry, out);\r
         \r
         Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort());\r
         Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort());\r
@@ -232,15 +213,6 @@ public class OF10ActionsSerializerTest {
         Assert.assertEquals("Wrong port", 6613, out.readUnsignedShort());\r
         out.skipBytes(6);\r
         Assert.assertEquals("Wrong queue-id", 400, out.readUnsignedInt());\r
-        Assert.assertEquals("Wrong action type", 65535, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong action length", 16, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong experimenter", 82, out.readUnsignedInt());\r
-        byte[] tmp = new byte[8];\r
-        out.readBytes(tmp);\r
-        Assert.assertArrayEquals("Wrong data", expData, tmp);\r
-        Assert.assertEquals("Wrong action type", 65535, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong experimenter", 102, out.readUnsignedInt());\r
         Assert.assertTrue("Written more bytes than needed", out.readableBytes() == 0);\r
     }\r
     \r