OF1.0 fixes
[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / FlowModInputMessageFactoryTest.java
index 28376ed6c21bf753fbd50d9365ddf0724a07b787..83cb7d285787453091debb94000be810e4004b49 100644 (file)
@@ -5,17 +5,40 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;\r
 \r
 import java.math.BigInteger;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
 \r
 import org.junit.Assert;\r
 import org.junit.Test;\r
 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.augments.rev131002.EcnMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EcnMatchEntryBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MetadataInstruction;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MetadataInstructionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortNumberMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortNumberMatchEntryBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.TableIdInstruction;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.TableIdInstructionBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.GotoTable;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.WriteMetadata;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.Instructions;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.instruction.rev130731.instructions.InstructionsBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModCommand;\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.PortNumber;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableId;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPhyPort;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.IpEcn;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Nxm0Class;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OxmMatchType;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntriesBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInputBuilder;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.match.grouping.MatchBuilder;\r
 \r
 /**\r
  * @author timotej.kubas\r
@@ -23,6 +46,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
  */\r
 public class FlowModInputMessageFactoryTest {\r
     private static final byte PADDING_IN_FLOW_MOD_MESSAGE = 2;\r
+    \r
     /**\r
      * @throws Exception \r
      * Testing of {@link FlowModInputMessageFactory} for correct translation from POJO\r
@@ -30,10 +54,10 @@ public class FlowModInputMessageFactoryTest {
     @Test\r
     public void testFlowModInputMessageFactory() throws Exception {\r
         FlowModInputBuilder builder = new FlowModInputBuilder();\r
-        BufferHelper.setupHeader(builder);\r
-        byte[] cookie = new byte[]{0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01};\r
+        BufferHelper.setupHeader(builder, EncodeConstants.OF13_VERSION_ID);\r
+        byte[] cookie = new byte[]{0x00, 0x01, 0x04, 0x01, 0x06, 0x00, 0x07, 0x01};\r
         builder.setCookie(new BigInteger(cookie));\r
-        byte[] cookieMask = new byte[]{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};\r
+        byte[] cookieMask = new byte[]{0x01, 0x05, 0x00, 0x00, 0x09, 0x30, 0x00, 0x30};\r
         builder.setCookieMask(new BigInteger(cookieMask));\r
         builder.setTableId(new TableId(65L));\r
         builder.setCommand(FlowModCommand.forValue(2));\r
@@ -44,6 +68,40 @@ public class FlowModInputMessageFactoryTest {
         builder.setOutPort(new PortNumber(4422L));\r
         builder.setOutGroup(98L);\r
         builder.setFlags(new FlowModFlags(true, false, true, false, true));\r
+        MatchBuilder matchBuilder = new MatchBuilder();\r
+        matchBuilder.setType(OxmMatchType.class);\r
+        List<MatchEntries> entries = new ArrayList<>();\r
+        MatchEntriesBuilder entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(InPhyPort.class);\r
+        entriesBuilder.setHasMask(false);\r
+        PortNumberMatchEntryBuilder portNumberBuilder = new PortNumberMatchEntryBuilder();\r
+        portNumberBuilder.setPortNumber(new PortNumber(42L));\r
+        entriesBuilder.addAugmentation(PortNumberMatchEntry.class, portNumberBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        entriesBuilder.setOxmClass(Nxm0Class.class);\r
+        entriesBuilder.setOxmMatchField(IpEcn.class);\r
+        entriesBuilder.setHasMask(false);\r
+        EcnMatchEntryBuilder ecnBuilder = new EcnMatchEntryBuilder();\r
+        ecnBuilder.setEcn((short) 4);\r
+        entriesBuilder.addAugmentation(EcnMatchEntry.class, ecnBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        matchBuilder.setMatchEntries(entries);\r
+        builder.setMatch(matchBuilder.build());\r
+        List<Instructions> instructions = new ArrayList<>();\r
+        InstructionsBuilder insBuilder = new InstructionsBuilder();\r
+        insBuilder.setType(GotoTable.class);\r
+        TableIdInstructionBuilder idBuilder = new TableIdInstructionBuilder();\r
+        idBuilder.setTableId((short) 43);\r
+        insBuilder.addAugmentation(TableIdInstruction.class, idBuilder.build());\r
+        instructions.add(insBuilder.build());\r
+        insBuilder.setType(WriteMetadata.class);\r
+        MetadataInstructionBuilder metaBuilder = new MetadataInstructionBuilder();\r
+        metaBuilder.setMetadata(cookie);\r
+        metaBuilder.setMetadataMask(cookieMask);\r
+        insBuilder.addAugmentation(MetadataInstruction.class, metaBuilder.build());\r
+        instructions.add(insBuilder.build());\r
+        builder.setInstructions(instructions);\r
         FlowModInput message = builder.build();\r
         \r
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
@@ -53,21 +111,47 @@ public class FlowModInputMessageFactoryTest {
         BufferHelper.checkHeaderV13(out, factory.getMessageType(), factory.computeLength(message));\r
         Assert.assertEquals("Wrong cookie", message.getCookie().longValue(), out.readLong());\r
         Assert.assertEquals("Wrong cookieMask", message.getCookieMask().longValue(), out.readLong());\r
-        Assert.assertEquals("Wrong tableId", message.getTableId().getValue().intValue(), out.readByte());\r
-        Assert.assertEquals("Wrong command", message.getCommand().getIntValue(), out.readByte());\r
+        Assert.assertEquals("Wrong tableId", message.getTableId().getValue().intValue(), out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong command", message.getCommand().getIntValue(), out.readUnsignedByte());\r
         Assert.assertEquals("Wrong idleTimeOut", message.getIdleTimeout().intValue(), out.readShort());\r
         Assert.assertEquals("Wrong hardTimeOut", message.getHardTimeout().intValue(), out.readShort());\r
         Assert.assertEquals("Wrong priority", message.getPriority().intValue(), out.readUnsignedShort());\r
         Assert.assertEquals("Wrong bufferId", message.getBufferId().intValue(), out.readUnsignedInt());\r
         Assert.assertEquals("Wrong outPort", message.getOutPort().getValue().intValue(), out.readUnsignedInt());\r
         Assert.assertEquals("Wrong outGroup", message.getOutGroup().intValue(), out.readUnsignedInt());\r
-        Assert.assertEquals("Wrong flags", message.getFlags(), createFlowModFalgsFromBitmap(out.readShort()));\r
+        Assert.assertEquals("Wrong flags", message.getFlags(), createFlowModFlagsFromBitmap(out.readUnsignedShort()));\r
         out.skipBytes(PADDING_IN_FLOW_MOD_MESSAGE);\r
-        // TODO implementation of match structure\r
-        // TODO implementation of instructions\r
+        Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());\r
+        out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        Assert.assertEquals("Wrong oxm class", 0x8000, out.readUnsignedShort());\r
+        short fieldAndMask = out.readUnsignedByte();\r
+        Assert.assertEquals("Wrong oxm hasMask", 0, fieldAndMask & 1);\r
+        Assert.assertEquals("Wrong oxm field", 1, fieldAndMask >> 1);\r
+        out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
+        Assert.assertEquals("Wrong oxm value", 42, out.readUnsignedInt());\r
+        Assert.assertEquals("Wrong oxm class", 0, out.readUnsignedShort());\r
+        fieldAndMask = out.readUnsignedByte();\r
+        Assert.assertEquals("Wrong oxm hasMask", 0, fieldAndMask & 1);\r
+        Assert.assertEquals("Wrong oxm field", 9, fieldAndMask >> 1);\r
+        out.skipBytes(EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
+        Assert.assertEquals("Wrong oxm value", 4, out.readUnsignedByte());\r
+        out.skipBytes(7);\r
+        Assert.assertEquals("Wrong instruction type", 1, out.readUnsignedShort());\r
+        out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        Assert.assertEquals("Wrong instruction value", 43, out.readUnsignedByte());\r
+        out.skipBytes(3);\r
+        Assert.assertEquals("Wrong instruction type", 2, out.readUnsignedShort());\r
+        out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        out.skipBytes(EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+        byte[] cookieRead = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];\r
+        out.readBytes(cookieRead);\r
+        byte[] cookieMaskRead = new byte[EncodeConstants.SIZE_OF_LONG_IN_BYTES];\r
+        out.readBytes(cookieMaskRead);\r
+        Assert.assertArrayEquals("Wrong metadata", cookie, cookieRead);\r
+        Assert.assertArrayEquals("Wrong metadata mask", cookieMask, cookieMaskRead); \r
     }\r
     \r
-    private static FlowModFlags createFlowModFalgsFromBitmap(short input){\r
+    private static FlowModFlags createFlowModFlagsFromBitmap(int input){\r
         final Boolean _oFPFFSENDFLOWREM = (input & (1 << 0)) > 0;\r
         final Boolean _oFPFFCHECKOVERLAP = (input & (1 << 1)) > 0;\r
         final Boolean _oFPFFRESETCOUNTS = (input & (1 << 2)) > 0; \r