Merge "Quickfix - Vlan-vid match entry"
[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / util / MatchSerializer.java
index 59c4ec6ec5870e4c140f929cd8f97000f267fa9c..bde832c0206aae3ab089da9dd8e00c51cbd5e56e 100644 (file)
@@ -3,14 +3,23 @@ package org.opendaylight.openflowjava.protocol.impl.util;
 \r
 import io.netty.buffer.ByteBuf;\r
 \r
+import java.util.Arrays;\r
+import java.util.HashMap;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.BosMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DscpMatchEntry;\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.EthTypeMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4CodeMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4TypeMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6CodeMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6TypeMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv4AddressMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6AddressMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6FlabelMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.IsidMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MacAddressMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaskMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MetadataMatchEntry;\r
@@ -18,6 +27,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OpCodeMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntry;\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.ProtocolNumberMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PseudoFieldMatchEntry;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PseudoFieldMatchEntry.PseudoField;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.TcMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanPcpMatchEntry;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntry;\r
@@ -70,239 +82,297 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpS
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanPcp;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanVid;\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.protocol.rev130731.flow.mod.Match;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.match.grouping.Match;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
 /**\r
+ * Serializes ofp_match (OpenFlow v1.3) and its oxm_fields structures\r
  * @author michal.polkorab\r
- *\r
+ * @author timotej.kubas\r
  */\r
 public class MatchSerializer {\r
-    \r
     private static final Logger LOGGER = LoggerFactory.getLogger(MatchSerializer.class);\r
+    private static final byte STANDARD_MATCH_TYPE_CODE = 0;\r
+    private static final byte OXM_MATCH_TYPE_CODE = 1;\r
+    private static final int NXM0_CLASS_CODE = 0x0000;\r
+    private static final int NXM1_CLASS_CODE = 0x0001;\r
+    private static final int OPENFLOW_BASIC_CLASS_CODE = 0x8000;\r
+    private static final int EXPERIMENTER_CLASS_CODE = 0xFFFF;\r
+    private static final byte MATCH_TYPE_AND_LENGTH_SIZE = 4;\r
+    private static final byte MATCH_ENTRY_HEADER_LENGTH = 4;\r
 \r
     /**\r
-     * Encodes OF match\r
+     * Encodes match (OpenFlow v1.3)\r
      * @param match ofp_match object\r
      * @param out output ByteBuf\r
      */\r
     public static void encodeMatch(Match match, ByteBuf out) {\r
-        final byte PADDING_IN_OFP_MATCH = 4;\r
+        if (match == null) {\r
+            LOGGER.debug("Match is null");\r
+            return;\r
+        }\r
         encodeType(match, out);\r
-        //TODO - compute length\r
+        // Length of ofp_match (excluding padding)\r
+        int length = computeMatchLengthInternal(match);\r
+        out.writeShort(length);\r
         encodeMatchEntries(match.getMatchEntries(), out);\r
-        ByteBufUtils.padBuffer(PADDING_IN_OFP_MATCH, out);\r
-        \r
+        int paddingRemainder = length % EncodeConstants.PADDING;\r
+        if (paddingRemainder != 0) {\r
+            ByteBufUtils.padBuffer(EncodeConstants.PADDING - paddingRemainder, out);\r
+        }\r
     }\r
 \r
     private static void encodeType(Match match, ByteBuf out) {\r
-        final byte STANDARD_MATCH_TYPE_CODE = 0;\r
-        final byte OXM_MATCH_TYPE_CODE = 1;\r
-        if (match.getType().equals(StandardMatchType.class)) {\r
+        if (match.getType().isAssignableFrom(StandardMatchType.class)) {\r
             out.writeShort(STANDARD_MATCH_TYPE_CODE);\r
-        } else if (match.getType().equals(OxmMatchType.class)) {\r
+        } else if (match.getType().isAssignableFrom(OxmMatchType.class)) {\r
             out.writeShort(OXM_MATCH_TYPE_CODE);\r
         }\r
     }\r
 \r
-    private static void encodeMatchEntries(List<MatchEntries> matchEntries, ByteBuf out) {\r
+    /**\r
+     * Encodes MatchEntries\r
+     * @param matchEntries list of match entries (oxm_fields)\r
+     * @param out output ByteBuf\r
+     */\r
+    public static void encodeMatchEntries(List<MatchEntries> matchEntries, ByteBuf out) {\r
         if (matchEntries == null) {\r
-            LOGGER.warn("Match entry is null");\r
+            LOGGER.warn("Match entries are null");\r
             return;\r
         }\r
         for (MatchEntries entry : matchEntries) {\r
             encodeClass(entry.getOxmClass(), out);\r
-            encodeRest(entry, null);\r
+            encodeRest(entry, out);\r
         }\r
     }\r
 \r
     private static void encodeClass(Class<? extends Clazz> clazz, ByteBuf out) {\r
-        final int NXM0_CLASS_CODE = 0x0000;\r
-        final int NXM1_CLASS_CODE = 0x0001;\r
-        final int OPENFLOW_BASIC_CLASS_CODE = 0x8000;\r
-        final int EXPERIMENTER_CLASS_CODE = 0xFFFF;\r
-        if (Nxm0Class.class.equals(clazz)) {\r
+        if (clazz.isAssignableFrom(Nxm0Class.class)) {\r
             out.writeShort(NXM0_CLASS_CODE);\r
-        } else if (Nxm1Class.class.equals(clazz)) {\r
+        } else if (clazz.isAssignableFrom(Nxm1Class.class)) {\r
             out.writeShort(NXM1_CLASS_CODE);\r
-        } else if (OpenflowBasicClass.class.equals(clazz)) {\r
+        } else if (clazz.isAssignableFrom(OpenflowBasicClass.class)) {\r
             out.writeShort(OPENFLOW_BASIC_CLASS_CODE);\r
-        } else if (ExperimenterClass.class.equals(clazz)) {\r
+        } else if (clazz.isAssignableFrom(ExperimenterClass.class)) {\r
             out.writeShort(EXPERIMENTER_CLASS_CODE);\r
         }\r
     }\r
-    \r
+\r
     private static void encodeRest(MatchEntries entry, ByteBuf out) {\r
         int fieldValue = 0;\r
         Class<? extends MatchField> field = entry.getOxmMatchField();\r
-        if (field.equals(InPort.class)) {\r
+        if (field.isAssignableFrom(InPort.class)) {\r
             fieldValue = 0;\r
-            writeOxmFieldAndLength(out, fieldValue, Integer.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
             out.writeInt(entry.getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());\r
-        } else if (field.equals(InPhyPort.class)) {\r
+        } else if (field.isAssignableFrom(InPhyPort.class)) {\r
             fieldValue = 1;\r
-            writeOxmFieldAndLength(out, fieldValue, Integer.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
             out.writeInt(entry.getAugmentation(PortNumberMatchEntry.class).getPortNumber().getValue().intValue());\r
-        } else if (field.equals(Metadata.class)) {\r
+        } else if (field.isAssignableFrom(Metadata.class)) {\r
             fieldValue = 2;\r
-            fieldValue = fieldValue << 1;\r
-            if (entry.isHasMask()) {\r
-                fieldValue = fieldValue | 1;\r
-                out.writeByte(fieldValue);\r
-                byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
-                out.writeByte(Long.SIZE / Byte.SIZE + mask.length);\r
-                out.writeBytes(entry.getAugmentation(MetadataMatchEntry.class).getMetadata());\r
-                out.writeBytes(mask);\r
-            } else {\r
-                out.writeByte(fieldValue);\r
-                out.writeByte(Long.SIZE / Byte.SIZE);\r
-                out.writeBytes(entry.getAugmentation(MetadataMatchEntry.class).getMetadata());\r
-            }\r
-        } else if (field.equals(EthDst.class)) {\r
+            writeMetadataRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(EthDst.class)) {\r
             fieldValue = 3;\r
-            fieldValue = fieldValue << 1;\r
-            if (entry.isHasMask()) {\r
-                fieldValue = fieldValue | 1;\r
-                out.writeByte(fieldValue);\r
-                byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
-                out.writeByte((Integer.SIZE + Short.SIZE) / Byte.SIZE + mask.length);\r
-                out.writeBytes(entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue().getBytes());\r
-                out.writeBytes(entry.getAugmentation(MaskMatchEntry.class).getMask());\r
-            } else {\r
-                out.writeByte(fieldValue);\r
-                out.writeByte(Long.SIZE / Byte.SIZE);\r
-                out.writeBytes(entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue().getBytes());\r
-            }\r
-        } else if (field.equals(EthSrc.class)) {\r
+            writeMacAddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(EthSrc.class)) {\r
             fieldValue = 4;\r
-            fieldValue = fieldValue << 1;\r
-            if (entry.isHasMask()) {\r
-                fieldValue = fieldValue | 1;\r
-                out.writeByte(fieldValue);\r
-                byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
-                out.writeByte(Long.SIZE / Byte.SIZE + mask.length);\r
-                out.writeBytes(entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue().getBytes());\r
-                out.writeBytes(mask);\r
-            } else {\r
-                out.writeByte(fieldValue);\r
-                out.writeByte(Long.SIZE / Byte.SIZE);\r
-                out.writeBytes(entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue().getBytes());\r
-            }\r
-        } else if (field.equals(EthType.class)) {\r
+            writeMacAddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(EthType.class)) {\r
             fieldValue = 5;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(EthTypeMatchEntry.class).getEthType().getValue().shortValue());\r
-        } else if (field.equals(VlanVid.class)) {\r
+        } else if (field.isAssignableFrom(VlanVid.class)) {\r
             fieldValue = 6;\r
             fieldValue = fieldValue << 1;\r
+            VlanVidMatchEntry vlanVid = entry.getAugmentation(VlanVidMatchEntry.class);\r
+            int vlanVidValue = vlanVid.getVlanVid();\r
+            if (vlanVid.isCfiBit()) {\r
+                short cfi = 1 << 12; // 13-th bit\r
+                vlanVidValue = vlanVidValue | cfi;\r
+            }\r
             if (entry.isHasMask()) {\r
                 fieldValue = fieldValue | 1;\r
                 out.writeByte(fieldValue);\r
                 byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
-                out.writeByte(Short.SIZE / Byte.SIZE + mask.length);\r
-                out.writeShort(entry.getAugmentation(VlanVidMatchEntry.class).getVlanVid());\r
+                out.writeByte(EncodeConstants.SIZE_OF_SHORT_IN_BYTES + mask.length);\r
+                out.writeShort(vlanVidValue);\r
                 out.writeBytes(mask);\r
             } else {\r
-                writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
-                out.writeShort(entry.getAugmentation(VlanVidMatchEntry.class).getVlanVid());\r
+                writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+                out.writeShort(vlanVidValue);\r
             }\r
-        } else if (field.equals(VlanPcp.class)) {\r
+        } else if (field.isAssignableFrom(VlanPcp.class)) {\r
             fieldValue = 7;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeByte(entry.getAugmentation(VlanPcpMatchEntry.class).getVlanPcp().byteValue());\r
-        } else if (field.equals(IpDscp.class)) {\r
+        } else if (field.isAssignableFrom(IpDscp.class)) {\r
             fieldValue = 8;\r
-        } else if (field.equals(IpEcn.class)) {\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
+            out.writeByte(entry.getAugmentation(DscpMatchEntry.class).getDscp().getValue());\r
+        } else if (field.isAssignableFrom(IpEcn.class)) {\r
             fieldValue = 9;\r
-        } else if (field.equals(IpProto.class)) {\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
+            out.writeByte(entry.getAugmentation(EcnMatchEntry.class).getEcn());\r
+        } else if (field.isAssignableFrom(IpProto.class)) {\r
             fieldValue = 10;\r
-        } else if (field.equals(Ipv4Src.class)) {\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
+            out.writeByte(entry.getAugmentation(ProtocolNumberMatchEntry.class).getProtocolNumber());\r
+        } else if (field.isAssignableFrom(Ipv4Src.class)) {\r
             fieldValue = 11;\r
-        } else if (field.equals(Ipv4Dst.class)) {\r
+            writeIpv4AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv4Dst.class)) {\r
             fieldValue = 12;\r
-        } else if (field.equals(TcpSrc.class)) {\r
+            writeIpv4AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(TcpSrc.class)) {\r
             fieldValue = 13;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(PortMatchEntry.class).getPort().getValue().intValue());\r
-        } else if (field.equals(TcpDst.class)) {\r
+        } else if (field.isAssignableFrom(TcpDst.class)) {\r
             fieldValue = 14;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(PortMatchEntry.class).getPort().getValue().intValue());\r
-        } else if (field.equals(UdpSrc.class)) {\r
+        } else if (field.isAssignableFrom(UdpSrc.class)) {\r
             fieldValue = 15;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(PortMatchEntry.class).getPort().getValue().intValue());\r
-        } else if (field.equals(UdpDst.class)) {\r
+        } else if (field.isAssignableFrom(UdpDst.class)) {\r
             fieldValue = 16;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(PortMatchEntry.class).getPort().getValue().intValue());\r
-        } else if (field.equals(SctpSrc.class)) {\r
+        } else if (field.isAssignableFrom(SctpSrc.class)) {\r
             fieldValue = 17;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(PortMatchEntry.class).getPort().getValue().intValue());\r
-        } else if (field.equals(SctpDst.class)) {\r
+        } else if (field.isAssignableFrom(SctpDst.class)) {\r
             fieldValue = 18;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(PortMatchEntry.class).getPort().getValue().intValue());\r
-        } else if (field.equals(Icmpv4Type.class)) {\r
+        } else if (field.isAssignableFrom(Icmpv4Type.class)) {\r
             fieldValue = 19;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeByte(entry.getAugmentation(Icmpv4TypeMatchEntry.class).getIcmpv4Type());\r
-        } else if (field.equals(Icmpv4Code.class)) {\r
+        } else if (field.isAssignableFrom(Icmpv4Code.class)) {\r
             fieldValue = 20;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeByte(entry.getAugmentation(Icmpv4CodeMatchEntry.class).getIcmpv4Code());\r
-        } else if (field.equals(ArpOp.class)) {\r
+        } else if (field.isAssignableFrom(ArpOp.class)) {\r
             fieldValue = 21;\r
-            writeOxmFieldAndLength(out, fieldValue, Short.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
             out.writeShort(entry.getAugmentation(OpCodeMatchEntry.class).getOpCode());\r
-        } else if (field.equals(ArpSpa.class)) {\r
+        } else if (field.isAssignableFrom(ArpSpa.class)) {\r
             fieldValue = 22;\r
-        } else if (field.equals(ArpTpa.class)) {\r
+            writeIpv4AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(ArpTpa.class)) {\r
             fieldValue = 23;\r
-        } else if (field.equals(ArpSha.class)) {\r
+            writeIpv4AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(ArpSha.class)) {\r
             fieldValue = 24;\r
-        } else if (field.equals(ArpTha.class)) {\r
+            writeMacAddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(ArpTha.class)) {\r
             fieldValue = 25;\r
-        } else if (field.equals(Ipv6Src.class)) {\r
+            writeMacAddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv6Src.class)) {\r
             fieldValue = 26;\r
-        } else if (field.equals(Ipv6Dst.class)) {\r
+            writeIpv6AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv6Dst.class)) {\r
             fieldValue = 27;\r
-        } else if (field.equals(Ipv6Flabel.class)) {\r
+            writeIpv6AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv6Flabel.class)) {\r
             fieldValue = 28;\r
-        } else if (field.equals(Icmpv6Type.class)) {\r
+            fieldValue = fieldValue << 1;\r
+            if (entry.isHasMask()) {\r
+                fieldValue = fieldValue | 1;\r
+                out.writeByte(fieldValue);\r
+                byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+                out.writeByte(EncodeConstants.SIZE_OF_INT_IN_BYTES + mask.length); // 20 b + mask [OF 1.3.2 spec]\r
+                LOGGER.warn("Ipv6Flabel match entry: possible wrong length written (wrote 4 - maybe must be 3)");\r
+                out.writeInt(entry.getAugmentation(Ipv6FlabelMatchEntry.class).getIpv6Flabel().getValue().intValue());\r
+                out.writeBytes(entry.getAugmentation(MaskMatchEntry.class).getMask());\r
+            } else {\r
+                out.writeByte(fieldValue);\r
+                out.writeByte(EncodeConstants.SIZE_OF_INT_IN_BYTES); // 20 b [OF 1.3.2 spec]\r
+                LOGGER.warn("Ipv6Flabel match entry: possible wrong length written (wrote 4 - maybe must be 3)");\r
+                out.writeInt(entry.getAugmentation(Ipv6FlabelMatchEntry.class).getIpv6Flabel().getValue().intValue());\r
+            }\r
+        } else if (field.isAssignableFrom(Icmpv6Type.class)) {\r
             fieldValue = 29;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeByte(entry.getAugmentation(Icmpv6TypeMatchEntry.class).getIcmpv6Type());\r
-        } else if (field.equals(Icmpv6Code.class)) {\r
+        } else if (field.isAssignableFrom(Icmpv6Code.class)) {\r
             fieldValue = 30;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeByte(entry.getAugmentation(Icmpv6CodeMatchEntry.class).getIcmpv6Code());\r
-        } else if (field.equals(Ipv6NdTarget.class)) {\r
+        } else if (field.isAssignableFrom(Ipv6NdTarget.class)) {\r
             fieldValue = 31;\r
-        } else if (field.equals(Ipv6NdSll.class)) {\r
+            writeIpv6AddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv6NdSll.class)) {\r
             fieldValue = 32;\r
-        } else if (field.equals(Ipv6NdTll.class)) {\r
+            writeMacAddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv6NdTll.class)) {\r
             fieldValue = 33;\r
-        } else if (field.equals(MplsLabel.class)) {\r
+            writeMacAddressRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(MplsLabel.class)) {\r
             fieldValue = 34;\r
-            writeOxmFieldAndLength(out, fieldValue, Integer.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+            LOGGER.warn("MplsLabel match entry: possible wrong length written (wrote 4 - maybe must be 3)");\r
             out.writeInt(entry.getAugmentation(MplsLabelMatchEntry.class).getMplsLabel().intValue());\r
-        } else if (field.equals(MplsTc.class)) {\r
+        } else if (field.isAssignableFrom(MplsTc.class)) {\r
             fieldValue = 35;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeByte(entry.getAugmentation(TcMatchEntry.class).getTc());\r
-        } else if (field.equals(MplsBos.class)) {\r
+        } else if (field.isAssignableFrom(MplsBos.class)) {\r
             fieldValue = 36;\r
-            writeOxmFieldAndLength(out, fieldValue, Byte.SIZE / Byte.SIZE);\r
+            writeOxmFieldAndLength(out, fieldValue, EncodeConstants.SIZE_OF_BYTE_IN_BYTES);\r
             out.writeBoolean(entry.getAugmentation(BosMatchEntry.class).isBos().booleanValue());\r
-        } else if (field.equals(PbbIsid.class)) {\r
+        } else if (field.isAssignableFrom(PbbIsid.class)) {\r
             fieldValue = 37;\r
-        } else if (field.equals(TunnelId.class)) {\r
+            fieldValue = fieldValue << 1;\r
+            if (entry.isHasMask()) {\r
+                fieldValue = fieldValue | 1;\r
+                out.writeByte(fieldValue);\r
+                byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+                out.writeByte(EncodeConstants.SIZE_OF_LONG_IN_BYTES + mask.length);\r
+                LOGGER.warn("PbbIsid match entry: possible wrong length written (wrote 4 - maybe must be 3)");\r
+                out.writeInt(entry.getAugmentation(IsidMatchEntry.class).getIsid().intValue());\r
+                out.writeBytes(mask);\r
+            } else {\r
+                out.writeByte(fieldValue);\r
+                out.writeByte(EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                LOGGER.warn("PbbIsid match entry: possible wrong length written (wrote 4 - maybe must be 3)");\r
+                out.writeInt(entry.getAugmentation(IsidMatchEntry.class).getIsid().intValue());\r
+            }\r
+        } else if (field.isAssignableFrom(TunnelId.class)) {\r
             fieldValue = 38;\r
-        } else if (field.equals(Ipv6Exthdr.class)) {\r
+            writeMetadataRelatedEntry(entry, out, fieldValue);\r
+        } else if (field.isAssignableFrom(Ipv6Exthdr.class)) {\r
             fieldValue = 39;\r
+            fieldValue = fieldValue << 1;\r
+            PseudoField pseudoField = entry.getAugmentation(PseudoFieldMatchEntry.class).getPseudoField();\r
+            Map<Integer, Boolean> map = new HashMap<>();\r
+            map.put(0, pseudoField.isNonext());\r
+            map.put(1, pseudoField.isEsp());\r
+            map.put(2, pseudoField.isAuth());\r
+            map.put(3, pseudoField.isDest());\r
+            map.put(4, pseudoField.isFrag());\r
+            map.put(5, pseudoField.isRouter());\r
+            map.put(6, pseudoField.isHop());\r
+            map.put(7, pseudoField.isUnrep());\r
+            map.put(8, pseudoField.isUnseq());\r
+            int bitmap = ByteBufUtils.fillBitMaskFromMap(map);\r
+            if (entry.isHasMask()) {\r
+                fieldValue = fieldValue | 1;\r
+                out.writeByte(fieldValue);\r
+                byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+                out.writeByte(EncodeConstants.SIZE_OF_SHORT_IN_BYTES + mask.length);\r
+                out.writeShort(bitmap);\r
+                out.writeBytes(mask);\r
+            } else {\r
+                out.writeByte(fieldValue);\r
+                out.writeByte(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+                out.writeShort(bitmap);\r
+            }\r
         }\r
     }\r
 \r
@@ -311,5 +381,256 @@ public class MatchSerializer {
         out.writeByte(fieldAndMask);\r
         out.writeByte(length);\r
     }\r
-    \r
+\r
+    private static void writeMetadataRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
+        int fieldValue = value << 1;\r
+        if (entry.isHasMask()) {\r
+            fieldValue = fieldValue | 1;\r
+            out.writeByte(fieldValue);\r
+            byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+            out.writeByte(EncodeConstants.SIZE_OF_LONG_IN_BYTES + mask.length);\r
+            out.writeBytes(entry.getAugmentation(MetadataMatchEntry.class).getMetadata());\r
+            out.writeBytes(mask);\r
+        } else {\r
+            out.writeByte(fieldValue);\r
+            out.writeByte(EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+            out.writeBytes(entry.getAugmentation(MetadataMatchEntry.class).getMetadata());\r
+        }\r
+    }\r
+\r
+    private static void writeMacAddressRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
+        int fieldValue = value << 1;\r
+        if (entry.isHasMask()) {\r
+            fieldValue = fieldValue | 1;\r
+            out.writeByte(fieldValue);\r
+            byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+            out.writeByte(EncodeConstants.MAC_ADDRESS_LENGTH + mask.length); // 48 b + mask [OF 1.3.2 spec]\r
+            String macAddress = entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue();\r
+            out.writeBytes(ByteBufUtils.macAddressToBytes(macAddress));\r
+            out.writeBytes(mask);\r
+        } else {\r
+            out.writeByte(fieldValue);\r
+            out.writeByte(EncodeConstants.MAC_ADDRESS_LENGTH); // 48 b [OF 1.3.2 spec]\r
+            String macAddress = entry.getAugmentation(MacAddressMatchEntry.class).getMacAddress().getValue();\r
+            out.writeBytes(ByteBufUtils.macAddressToBytes(macAddress));\r
+        }\r
+    }\r
+\r
+    private static void writeIpv4AddressRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
+        int fieldValue = value << 1;\r
+        if (entry.isHasMask()) {\r
+            fieldValue = fieldValue | 1;\r
+            out.writeByte(fieldValue);\r
+            byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+            out.writeByte(EncodeConstants.SIZE_OF_INT_IN_BYTES + mask.length);\r
+            writeIpv4Address(entry, out);\r
+            out.writeBytes(mask);\r
+        } else {\r
+            out.writeByte(fieldValue);\r
+            out.writeByte(EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+            writeIpv4Address(entry, out);\r
+        }\r
+    }\r
+\r
+    private static void writeIpv4Address(MatchEntries entry, ByteBuf out) {\r
+        String[] addressGroups = entry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address().getValue().split("\\.");\r
+        for (int i = 0; i < addressGroups.length; i++) {\r
+            out.writeByte(Integer.parseInt(addressGroups[i]));\r
+        }\r
+    }\r
+\r
+    private static void writeIpv6AddressRelatedEntry(MatchEntries entry, ByteBuf out, int value) {\r
+        int fieldValue = value << 1;\r
+        String[] addressGroups = entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address().getValue().split(":");\r
+        String[] address = parseIpv6Address(addressGroups);\r
+        if (entry.isHasMask()) {\r
+            fieldValue = fieldValue | 1;\r
+            out.writeByte(fieldValue);\r
+            byte[] mask = entry.getAugmentation(MaskMatchEntry.class).getMask();\r
+            out.writeByte(EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES + mask.length);\r
+            for (int i = 0; i < address.length; i++) {\r
+                out.writeShort(Integer.parseInt(addressGroups[i], 16));\r
+            }\r
+            out.writeBytes(mask);\r
+        } else {\r
+            out.writeByte(fieldValue);\r
+            out.writeByte(EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);\r
+            for (int i = 0; i < addressGroups.length; i++) {\r
+                out.writeShort(Integer.parseInt(addressGroups[i], 16));\r
+            }\r
+        }\r
+    }\r
+\r
+    private static String[] parseIpv6Address(String[] addressGroups) {\r
+        int countEmpty = 0;\r
+        for (int i = 0; i < addressGroups.length; i++) {\r
+            if (addressGroups[i].equals("")){\r
+                countEmpty++;\r
+            }\r
+        }\r
+        String[] ready = new String[EncodeConstants.GROUPS_IN_IPV6_ADDRESS];\r
+        switch (countEmpty) {\r
+        case 0:\r
+            ready = addressGroups;\r
+            break;\r
+        case 1:\r
+            int zerosToBePushed = EncodeConstants.GROUPS_IN_IPV6_ADDRESS - addressGroups.length + 1;\r
+            int pushed = 0;\r
+            for (int i = 0; i < addressGroups.length; i++) {\r
+                if (addressGroups[i].equals("")) {\r
+                    for (int j = 0; j < zerosToBePushed; j++) {\r
+                        ready[i+j] = "0";\r
+                        pushed++;\r
+                    }\r
+                } else {\r
+                    ready[i + pushed] = addressGroups[i];\r
+                }\r
+            }\r
+            break;\r
+        case 2:\r
+            Arrays.fill(ready, "0");\r
+            ready[ready.length - 1] = addressGroups[addressGroups.length - 1];\r
+            break;\r
+        case 3:\r
+            Arrays.fill(ready, "0");\r
+            break;\r
+\r
+        default:\r
+            break;\r
+        }\r
+        return ready;\r
+    }\r
+\r
+    /**\r
+     * Computes length of match (in bytes)\r
+     * @param match\r
+     * @return length of ofp_match (excluding padding)\r
+     */\r
+    public static int computeMatchLengthInternal(Match match) {\r
+        int length = 0;\r
+        if (match != null) {\r
+            length += MATCH_TYPE_AND_LENGTH_SIZE + computeMatchEntriesLength(match.getMatchEntries());\r
+        }\r
+        return length;\r
+    }\r
+\r
+    /**\r
+     * Computes length of match (in bytes)\r
+     * @param match\r
+     * @return length of ofp_match (excluding padding)\r
+     */\r
+    public static int computeMatchLength(Match match) {\r
+        int length = computeMatchLengthInternal(match);\r
+        int paddingRemainder = length % EncodeConstants.PADDING;\r
+        if (paddingRemainder != 0) {\r
+            length += EncodeConstants.PADDING - paddingRemainder;\r
+        }\r
+        return length;\r
+    }\r
+\r
+    /**\r
+     * Computes length of MatchEntries (in bytes)\r
+     * @param matchEntries list of match entries (oxm_fields)\r
+     * @return length of MatchEntries\r
+     */\r
+    public static int computeMatchEntriesLength(List<MatchEntries> matchEntries) {\r
+        int length = 0;\r
+        if (matchEntries != null) {\r
+            for (MatchEntries entry : matchEntries) {\r
+                length += MATCH_ENTRY_HEADER_LENGTH;\r
+                Class<? extends MatchField> field = entry.getOxmMatchField();\r
+                if (field.isAssignableFrom(InPort.class)) {\r
+                    length += EncodeConstants.SIZE_OF_INT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(InPhyPort.class)) {\r
+                    length += EncodeConstants.SIZE_OF_INT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(Metadata.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                } else if (field.isAssignableFrom(EthDst.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
+                } else if (field.isAssignableFrom(EthSrc.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
+                } else if (field.isAssignableFrom(EthType.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(VlanVid.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(VlanPcp.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(IpDscp.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(IpEcn.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(IpProto.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(Ipv4Src.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(Ipv4Dst.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(TcpSrc.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(TcpDst.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(UdpSrc.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(UdpDst.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(SctpSrc.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(SctpDst.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(Icmpv4Type.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(Icmpv4Code.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(ArpOp.class)) {\r
+                    length += EncodeConstants.SIZE_OF_SHORT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(ArpSpa.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(ArpTpa.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(ArpSha.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
+                } else if (field.isAssignableFrom(ArpTha.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
+                } else if (field.isAssignableFrom(Ipv6Src.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);\r
+                } else if (field.isAssignableFrom(Ipv6Dst.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);\r
+                } else if (field.isAssignableFrom(Ipv6Flabel.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(Icmpv6Type.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(Icmpv6Code.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(Ipv6NdTarget.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_IPV6_ADDRESS_IN_BYTES);\r
+                } else if (field.isAssignableFrom(Ipv6NdSll.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
+                } else if (field.isAssignableFrom(Ipv6NdTll.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.MAC_ADDRESS_LENGTH);\r
+                } else if (field.isAssignableFrom(MplsLabel.class)) {\r
+                    length += EncodeConstants.SIZE_OF_INT_IN_BYTES;\r
+                } else if (field.isAssignableFrom(MplsTc.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(MplsBos.class)) {\r
+                    length += EncodeConstants.SIZE_OF_BYTE_IN_BYTES;\r
+                } else if (field.isAssignableFrom(PbbIsid.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_INT_IN_BYTES);\r
+                } else if (field.isAssignableFrom(TunnelId.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_LONG_IN_BYTES);\r
+                } else if (field.isAssignableFrom(Ipv6Exthdr.class)) {\r
+                    length += computePossibleMaskEntryLength(entry, EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+                }\r
+            }\r
+        }\r
+        return length;\r
+    }\r
+\r
+    private static int computePossibleMaskEntryLength(MatchEntries entry, int length) {\r
+        int entryLength = length;\r
+        if (entry.isHasMask()) {\r
+            entryLength *= 2;\r
+        }\r
+        return entryLength;\r
+    }\r
+\r
 }\r