X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Futil%2FOF13ActionsSerializerTest.java;h=bcc335c32272c20a6280d189ff6ad30567c19b2a;hb=60ad94454217d7d1f6f9e65f39f72ae111ecc845;hp=b450ccdcf962f7f0b957b583fa3f8ff99cd3b0bb;hpb=26aeaa7e2754b2cf4f6ad63055ab3ce34f68c961;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java
index b450ccdc..bcc335c3 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/OF13ActionsSerializerTest.java
@@ -21,8 +21,6 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthertypeActionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterAction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ExperimenterActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdAction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.GroupIdActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaxLengthAction;
@@ -43,7 +41,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.CopyTtlOut;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecMplsTtl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Experimenter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Group;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls;
@@ -178,23 +175,9 @@ public class OF13ActionsSerializerTest {
         actionBuilder = new ActionBuilder();
         actionBuilder.setType(PopPbb.class);
         actions.add(actionBuilder.build());
-        actionBuilder = new ActionBuilder();
-        actionBuilder.setType(Experimenter.class);
-        ExperimenterActionBuilder expBuilder = new ExperimenterActionBuilder();
-        expBuilder.setExperimenter(82L);
-        byte[] expData = new byte[]{0, 0, 0, 0, 0, 0, 0, 1};
-        expBuilder.setData(expData);
-        actionBuilder.addAugmentation(ExperimenterAction.class, expBuilder.build());
-        actions.add(actionBuilder.build());
-        actionBuilder = new ActionBuilder();
-        actionBuilder.setType(Experimenter.class);
-        expBuilder = new ExperimenterActionBuilder();
-        expBuilder.setExperimenter(102L);
-        actionBuilder.addAugmentation(ExperimenterAction.class, expBuilder.build());
-        actions.add(actionBuilder.build());
         
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
-        ListSerializer.serializeList(actions, EnhancedTypeKeyMakerFactory
+        ListSerializer.serializeList(actions, TypeKeyMakerFactory
                 .createActionKeyMaker(EncodeConstants.OF13_VERSION_ID), registry, out);
         
         Assert.assertEquals("Wrong action type", 0, out.readUnsignedShort());
@@ -257,15 +240,6 @@ public class OF13ActionsSerializerTest {
         Assert.assertEquals("Wrong action type", 27, out.readUnsignedShort());
         Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort());
         out.skipBytes(4);
-        Assert.assertEquals("Wrong action type", 65535, out.readUnsignedShort());
-        Assert.assertEquals("Wrong action length", 16, out.readUnsignedShort());
-        Assert.assertEquals("Wrong experimenter", 82, out.readUnsignedInt());
-        byte[] tmp = new byte[8];
-        out.readBytes(tmp);
-        Assert.assertArrayEquals("Wrong data", expData, tmp);
-        Assert.assertEquals("Wrong action type", 65535, out.readUnsignedShort());
-        Assert.assertEquals("Wrong action length", 8, out.readUnsignedShort());
-        Assert.assertEquals("Wrong experimenter", 102, out.readUnsignedInt());
         Assert.assertTrue("Unread data", out.readableBytes() == 0);
     }