Bug 2756 - Match model update
[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / util / OF13MatchSerializer02Test.java
index e607d0fce8ff1f187c6737b573ec429cb568d9a0..a7bad7ae5ffde4367cf4c3b6eab835b33f998985 100644 (file)
@@ -16,9 +16,9 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.openflowjava.protocol.api.extensibility.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;
+import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Dscp;
@@ -26,103 +26,135 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6FlowLabel;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.BosMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.BosMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DscpMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.DscpMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EcnMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EcnMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthTypeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.EthTypeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4CodeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4CodeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4TypeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv4TypeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6CodeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6CodeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6TypeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Icmpv6TypeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv4AddressMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv4AddressMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6AddressMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6AddressMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6FlabelMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6FlabelMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.IsidMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.IsidMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MacAddressMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MacAddressMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaskMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MaskMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MetadataMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MetadataMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MplsLabelMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.MplsLabelMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OpCodeMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.OpCodeMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortNumberMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PortNumberMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ProtocolNumberMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.ProtocolNumberMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PseudoFieldMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.PseudoFieldMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.TcMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.TcMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanPcpMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanPcpMatchEntryBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.EtherType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Ipv6ExthdrFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpOp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpSha;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpSpa;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpTha;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpTpa;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.EthType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv4Code;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv4Type;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv6Code;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Icmpv6Type;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPhyPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.InPort;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.IpDscp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.IpEcn;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.IpProto;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv4Dst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv4Src;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Dst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Exthdr;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Flabel;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6NdSll;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6NdTarget;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6NdTll;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Src;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Metadata;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.MplsBos;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.MplsLabel;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.MplsTc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OxmMatchType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.PbbIsid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.SctpDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.SctpSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TcpSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.TunnelId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpDst;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.UdpSrc;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanPcp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.VlanVid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.match.grouping.MatchBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntriesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpOp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpSha;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpSpa;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTha;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpTpa;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.EthType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv4Code;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv4Type;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv6Code;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Icmpv6Type;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPhyPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.InPort;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpDscp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpEcn;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.IpProto;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Dst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv4Src;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Dst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Exthdr;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Flabel;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6NdSll;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6NdTarget;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6NdTll;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Ipv6Src;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MplsBos;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MplsLabel;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MplsTc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmMatchType;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.PbbIsid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.SctpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.SctpSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TcpSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.TunnelId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpDst;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.UdpSrc;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanPcp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.VlanVid;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntryBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpOpCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpShaCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpSpaCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpThaCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ArpTpaCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.EthDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.EthSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.EthTypeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv4CodeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv4TypeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv6CodeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Icmpv6TypeCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.InPhyPortCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.InPortCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.IpDscpCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.IpEcnCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.IpProtoCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv4DstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv4SrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6DstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6ExthdrCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6FlabelCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6NdSllCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6NdTargetCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6NdTllCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.Ipv6SrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.MetadataCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.MplsBosCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.MplsLabelCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.MplsTcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.PbbIsidCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.SctpDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.SctpSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TcpDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TcpSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.TunnelIdCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.UdpDstCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.UdpSrcCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.VlanPcpCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.VlanVidCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.op._case.ArpOpBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.sha._case.ArpShaBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.spa._case.ArpSpaBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.tha._case.ArpThaBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.tpa._case.ArpTpaBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.eth.dst._case.EthDstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.eth.src._case.EthSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.eth.type._case.EthTypeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv4.code._case.Icmpv4CodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv4.type._case.Icmpv4TypeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv6.code._case.Icmpv6CodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.icmpv6.type._case.Icmpv6TypeBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.in.phy.port._case.InPhyPortBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.in.port._case.InPortBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ip.dscp._case.IpDscpBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ip.ecn._case.IpEcnBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ip.proto._case.IpProtoBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv4.dst._case.Ipv4DstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv4.src._case.Ipv4SrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.dst._case.Ipv6DstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.exthdr._case.Ipv6ExthdrBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.flabel._case.Ipv6FlabelBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.nd.sll._case.Ipv6NdSllBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.nd.target._case.Ipv6NdTargetBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.nd.tll._case.Ipv6NdTllBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.ipv6.src._case.Ipv6SrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.metadata._case.MetadataBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.mpls.bos._case.MplsBosBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.mpls.label._case.MplsLabelBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.mpls.tc._case.MplsTcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.pbb.isid._case.PbbIsidBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.sctp.dst._case.SctpDstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.sctp.src._case.SctpSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.tcp.dst._case.TcpDstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.tcp.src._case.TcpSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.tunnel.id._case.TunnelIdBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.udp.dst._case.UdpDstBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.udp.src._case.UdpSrcBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.vlan.pcp._case.VlanPcpBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.vlan.vid._case.VlanVidBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.MatchBuilder;
 
 /**
  * @author michal.polkorab
@@ -152,15 +184,15 @@ public class OF13MatchSerializer02Test {
         MatchBuilder builder = new MatchBuilder();
         builder.setType(OxmMatchType.class);
         Match match = builder.build();
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
-        
+
         Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());
         Assert.assertEquals("Wrong match length", 4, out.readUnsignedShort());
         Assert.assertTrue("Wrong padding", out.readableBytes() == 4);
     }
-    
+
     /**
      * Testing serialization of match
      */
@@ -168,395 +200,439 @@ public class OF13MatchSerializer02Test {
     public void test() {
         MatchBuilder builder = new MatchBuilder();
         builder.setType(OxmMatchType.class);
-        List<MatchEntries> entries = new ArrayList<>();
-        MatchEntriesBuilder entryBuilder = new MatchEntriesBuilder();
+        List<MatchEntry> entries = new ArrayList<>();
+        MatchEntryBuilder entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(InPort.class);
         entryBuilder.setHasMask(false);
-        PortNumberMatchEntryBuilder portNumberBuilder = new PortNumberMatchEntryBuilder();
-        portNumberBuilder.setPortNumber(new PortNumber(42L));
-        entryBuilder.addAugmentation(PortNumberMatchEntry.class, portNumberBuilder.build());
+        InPortCaseBuilder inPortCaseBuilder = new InPortCaseBuilder();
+        InPortBuilder inPortBuilder = new InPortBuilder();
+        inPortBuilder.setPortNumber(new PortNumber(42L));
+        inPortCaseBuilder.setInPort(inPortBuilder.build());
+        entryBuilder.setMatchEntryValue(inPortCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(InPhyPort.class);
         entryBuilder.setHasMask(false);
-        portNumberBuilder = new PortNumberMatchEntryBuilder();
-        portNumberBuilder.setPortNumber(new PortNumber(43L));
-        entryBuilder.addAugmentation(PortNumberMatchEntry.class, portNumberBuilder.build());
+        InPhyPortCaseBuilder inPhyPortCaseBuilder = new InPhyPortCaseBuilder();
+        InPhyPortBuilder inPhyPortBuilder = new InPhyPortBuilder();
+        inPhyPortBuilder.setPortNumber(new PortNumber(43L));
+        inPhyPortCaseBuilder.setInPhyPort(inPhyPortBuilder.build());
+        entryBuilder.setMatchEntryValue(inPhyPortCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Metadata.class);
         entryBuilder.setHasMask(true);
-        MetadataMatchEntryBuilder metadataBuilder = new MetadataMatchEntryBuilder();
+        MetadataCaseBuilder metaCaseBuilder = new MetadataCaseBuilder();
+        MetadataBuilder metadataBuilder = new MetadataBuilder();
         metadataBuilder.setMetadata(new byte[]{0,0,0,0,0,0,0,1});
-        entryBuilder.addAugmentation(MetadataMatchEntry.class, metadataBuilder.build());
-        MaskMatchEntryBuilder maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,0,0,0,0,2});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        metadataBuilder.setMask(new byte[]{0,0,0,0,0,0,0,2});
+        metaCaseBuilder.setMetadata(metadataBuilder.build());
+        entryBuilder.setMatchEntryValue(metaCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(EthDst.class);
         entryBuilder.setHasMask(true);
-        MacAddressMatchEntryBuilder macBuilder = new MacAddressMatchEntryBuilder();
-        macBuilder.setMacAddress(new MacAddress("01:00:03:00:00:06"));
-        entryBuilder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,0,0,5});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        EthDstCaseBuilder ethDstCaseBuilder = new EthDstCaseBuilder();
+        EthDstBuilder ethDstBuilder = new EthDstBuilder();
+        ethDstBuilder.setMacAddress(new MacAddress("01:00:03:00:00:06"));
+        ethDstBuilder.setMask(new byte[]{0,0,0,0,0,5});
+        ethDstCaseBuilder.setEthDst(ethDstBuilder.build());
+        entryBuilder.setMatchEntryValue(ethDstCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(EthSrc.class);
         entryBuilder.setHasMask(true);
-        macBuilder = new MacAddressMatchEntryBuilder();
-        macBuilder.setMacAddress(new MacAddress("04:00:02:00:00:08"));
-        entryBuilder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,0,0,2});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        EthSrcCaseBuilder ethSrcCaseBuilder = new EthSrcCaseBuilder();
+        EthSrcBuilder ethSrcBuilder = new EthSrcBuilder();
+        ethSrcBuilder.setMacAddress(new MacAddress("04:00:02:00:00:08"));
+        ethSrcBuilder.setMask(new byte[]{0,0,0,0,0,2});
+        ethSrcCaseBuilder.setEthSrc(ethSrcBuilder.build());
+        entryBuilder.setMatchEntryValue(ethSrcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(EthType.class);
         entryBuilder.setHasMask(false);
-        EthTypeMatchEntryBuilder ethBuilder = new EthTypeMatchEntryBuilder();
-        ethBuilder.setEthType(new EtherType(46));
-        entryBuilder.addAugmentation(EthTypeMatchEntry.class, ethBuilder.build());
+        EthTypeCaseBuilder ethTypeCaseBuilder = new EthTypeCaseBuilder();
+        EthTypeBuilder ethTypeBuilder = new EthTypeBuilder();
+        ethTypeBuilder.setEthType(new EtherType(46));
+        ethTypeCaseBuilder.setEthType(ethTypeBuilder.build());
+        entryBuilder.setMatchEntryValue(ethTypeCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(VlanVid.class);
         entryBuilder.setHasMask(true);
-        VlanVidMatchEntryBuilder vidBuilder = new VlanVidMatchEntryBuilder();
-        vidBuilder.setCfiBit(true);
-        vidBuilder.setVlanVid(45);
-        entryBuilder.addAugmentation(VlanVidMatchEntry.class, vidBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,9});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        VlanVidCaseBuilder vlanVidCaseBuilder = new VlanVidCaseBuilder();
+        VlanVidBuilder vlanVidBuilder = new VlanVidBuilder();
+        vlanVidBuilder.setVlanVid(45);
+        vlanVidBuilder.setCfiBit(true);
+        vlanVidBuilder.setMask(new byte[]{0,9});
+        vlanVidCaseBuilder.setVlanVid(vlanVidBuilder.build());
+        entryBuilder.setMatchEntryValue(vlanVidCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(VlanPcp.class);
         entryBuilder.setHasMask(false);
-        VlanPcpMatchEntryBuilder pcpBuilder = new VlanPcpMatchEntryBuilder();
-        pcpBuilder.setVlanPcp((short) 14);
-        entryBuilder.addAugmentation(VlanPcpMatchEntry.class, pcpBuilder.build());
+        VlanPcpCaseBuilder vlanPcpCaseBuilder = new VlanPcpCaseBuilder();
+        VlanPcpBuilder vlanPcpBuilder = new VlanPcpBuilder();
+        vlanPcpBuilder.setVlanPcp((short) 14);
+        vlanPcpCaseBuilder.setVlanPcp(vlanPcpBuilder.build());
+        entryBuilder.setMatchEntryValue(vlanPcpCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(IpDscp.class);
         entryBuilder.setHasMask(false);
-        DscpMatchEntryBuilder dscpBuilder = new DscpMatchEntryBuilder();
-        dscpBuilder.setDscp(new Dscp((short) 48));
-        entryBuilder.addAugmentation(DscpMatchEntry.class, dscpBuilder.build());
+        IpDscpCaseBuilder ipDscpCaseBuilder = new IpDscpCaseBuilder();
+        IpDscpBuilder ipDscpBuilder = new IpDscpBuilder();
+        ipDscpBuilder.setDscp(new Dscp((short) 48));
+        ipDscpCaseBuilder.setIpDscp(ipDscpBuilder.build());
+        entryBuilder.setMatchEntryValue(ipDscpCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(IpEcn.class);
         entryBuilder.setHasMask(false);
-        EcnMatchEntryBuilder ecnBuilder = new EcnMatchEntryBuilder();
-        ecnBuilder.setEcn((short) 49);
-        entryBuilder.addAugmentation(EcnMatchEntry.class, ecnBuilder.build());
+        IpEcnCaseBuilder ipEcnCaseBuilder = new IpEcnCaseBuilder();
+        IpEcnBuilder ipEcnBuilder = new IpEcnBuilder();
+        ipEcnBuilder.setEcn((short) 49);
+        ipEcnCaseBuilder.setIpEcn(ipEcnBuilder.build());
+        entryBuilder.setMatchEntryValue(ipEcnCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(IpProto.class);
         entryBuilder.setHasMask(false);
-        ProtocolNumberMatchEntryBuilder protoBuilder = new ProtocolNumberMatchEntryBuilder();
-        protoBuilder.setProtocolNumber((short) 50);
-        entryBuilder.addAugmentation(ProtocolNumberMatchEntry.class, protoBuilder.build());
+        IpProtoCaseBuilder ipProtoCaseBuilder = new IpProtoCaseBuilder();
+        IpProtoBuilder ipProtoBuilder = new IpProtoBuilder();
+        ipProtoBuilder.setProtocolNumber((short) 50);
+        ipProtoCaseBuilder.setIpProto(ipProtoBuilder.build());
+        entryBuilder.setMatchEntryValue(ipProtoCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv4Src.class);
         entryBuilder.setHasMask(true);
-        Ipv4AddressMatchEntryBuilder ipv4Builder = new Ipv4AddressMatchEntryBuilder();
-        ipv4Builder.setIpv4Address(new Ipv4Address("10.0.0.1"));
-        entryBuilder.addAugmentation(Ipv4AddressMatchEntry.class, ipv4Builder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,14});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();
+        Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();
+        ipv4SrcBuilder.setIpv4Address(new Ipv4Address("10.0.0.1"));
+        ipv4SrcBuilder.setMask(new byte[]{0,0,0,14});
+        ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv4Dst.class);
         entryBuilder.setHasMask(true);
-        ipv4Builder = new Ipv4AddressMatchEntryBuilder();
-        ipv4Builder.setIpv4Address(new Ipv4Address("10.0.0.2"));
-        entryBuilder.addAugmentation(Ipv4AddressMatchEntry.class, ipv4Builder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,15});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();
+        Ipv4DstBuilder ipv4DstBuilder = new Ipv4DstBuilder();
+        ipv4DstBuilder.setIpv4Address(new Ipv4Address("10.0.0.2"));
+        ipv4DstBuilder.setMask(new byte[]{0,0,0,15});
+        ipv4DstCaseBuilder.setIpv4Dst(ipv4DstBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(TcpSrc.class);
         entryBuilder.setHasMask(false);
-        PortMatchEntryBuilder portBuilder = new PortMatchEntryBuilder();
-        portBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
+        TcpSrcCaseBuilder tcpSrcCaseBuilder = new TcpSrcCaseBuilder();
+        TcpSrcBuilder tcpSrcBuilder = new TcpSrcBuilder();
+        tcpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.inet.types.rev100924.PortNumber(6653));
-        entryBuilder.addAugmentation(PortMatchEntry.class, portBuilder.build());
+        tcpSrcCaseBuilder.setTcpSrc(tcpSrcBuilder.build());
+        entryBuilder.setMatchEntryValue(tcpSrcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(TcpDst.class);
         entryBuilder.setHasMask(false);
-        portBuilder = new PortMatchEntryBuilder();
-        portBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
+        TcpDstCaseBuilder tcpDstCaseBuilder = new TcpDstCaseBuilder();
+        TcpDstBuilder tcpDstBuilder = new TcpDstBuilder();
+        tcpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.inet.types.rev100924.PortNumber(6654));
-        entryBuilder.addAugmentation(PortMatchEntry.class, portBuilder.build());
+        tcpDstCaseBuilder.setTcpDst(tcpDstBuilder.build());
+        entryBuilder.setMatchEntryValue(tcpDstCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(UdpSrc.class);
         entryBuilder.setHasMask(false);
-        portBuilder = new PortMatchEntryBuilder();
-        portBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
+        UdpSrcCaseBuilder udpSrcCaseBuilder = new UdpSrcCaseBuilder();
+        UdpSrcBuilder udpSrcBuilder = new UdpSrcBuilder();
+        udpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.inet.types.rev100924.PortNumber(6655));
-        entryBuilder.addAugmentation(PortMatchEntry.class, portBuilder.build());
+        udpSrcCaseBuilder.setUdpSrc(udpSrcBuilder.build());
+        entryBuilder.setMatchEntryValue(udpSrcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(UdpDst.class);
         entryBuilder.setHasMask(false);
-        portBuilder = new PortMatchEntryBuilder();
-        portBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
+        UdpDstCaseBuilder udpDstCaseBuilder = new UdpDstCaseBuilder();
+        UdpDstBuilder udpDstBuilder = new UdpDstBuilder();
+        udpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.inet.types.rev100924.PortNumber(6656));
-        entryBuilder.addAugmentation(PortMatchEntry.class, portBuilder.build());
+        udpDstCaseBuilder.setUdpDst(udpDstBuilder.build());
+        entryBuilder.setMatchEntryValue(udpDstCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(SctpSrc.class);
         entryBuilder.setHasMask(false);
-        portBuilder = new PortMatchEntryBuilder();
-        portBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
+        SctpSrcCaseBuilder sctpSrcCaseBuilder = new SctpSrcCaseBuilder();
+        SctpSrcBuilder sctpSrcBuilder = new SctpSrcBuilder();
+        sctpSrcBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.inet.types.rev100924.PortNumber(6657));
-        entryBuilder.addAugmentation(PortMatchEntry.class, portBuilder.build());
+        sctpSrcCaseBuilder.setSctpSrc(sctpSrcBuilder.build());
+        entryBuilder.setMatchEntryValue(sctpSrcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(SctpDst.class);
         entryBuilder.setHasMask(false);
-        portBuilder = new PortMatchEntryBuilder();
-        portBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
+        SctpDstCaseBuilder sctpDstCaseBuilder = new SctpDstCaseBuilder();
+        SctpDstBuilder sctpDstBuilder = new SctpDstBuilder();
+        sctpDstBuilder.setPort(new org.opendaylight.yang.gen.v1.urn.ietf.params
                 .xml.ns.yang.ietf.inet.types.rev100924.PortNumber(6658));
-        entryBuilder.addAugmentation(PortMatchEntry.class, portBuilder.build());
+        sctpDstCaseBuilder.setSctpDst(sctpDstBuilder.build());
+        entryBuilder.setMatchEntryValue(sctpDstCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Icmpv4Type.class);
         entryBuilder.setHasMask(false);
-        Icmpv4TypeMatchEntryBuilder icmpv4typeBuilder = new Icmpv4TypeMatchEntryBuilder();
-        icmpv4typeBuilder.setIcmpv4Type((short) 51);
-        entryBuilder.addAugmentation(Icmpv4TypeMatchEntry.class, icmpv4typeBuilder.build());
+        Icmpv4TypeCaseBuilder icmpv4TypeCaseBuilder = new Icmpv4TypeCaseBuilder();
+        Icmpv4TypeBuilder icmpv4TypeBuilder = new Icmpv4TypeBuilder();
+        icmpv4TypeBuilder.setIcmpv4Type((short) 51);
+        icmpv4TypeCaseBuilder.setIcmpv4Type(icmpv4TypeBuilder.build());
+        entryBuilder.setMatchEntryValue(icmpv4TypeCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Icmpv4Code.class);
         entryBuilder.setHasMask(false);
-        Icmpv4CodeMatchEntryBuilder icmpv4CodeBuilder = new Icmpv4CodeMatchEntryBuilder();
+        Icmpv4CodeCaseBuilder icmpv4CodeCaseBuilder = new Icmpv4CodeCaseBuilder();
+        Icmpv4CodeBuilder icmpv4CodeBuilder = new Icmpv4CodeBuilder();
         icmpv4CodeBuilder.setIcmpv4Code((short) 52);
-        entryBuilder.addAugmentation(Icmpv4CodeMatchEntry.class, icmpv4CodeBuilder.build());
+        icmpv4CodeCaseBuilder.setIcmpv4Code(icmpv4CodeBuilder.build());
+        entryBuilder.setMatchEntryValue(icmpv4CodeCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(ArpOp.class);
         entryBuilder.setHasMask(false);
-        OpCodeMatchEntryBuilder opBuilder = new OpCodeMatchEntryBuilder();
-        opBuilder.setOpCode(53);
-        entryBuilder.addAugmentation(OpCodeMatchEntry.class, opBuilder.build());
+        ArpOpCaseBuilder arpOpCaseBuilder = new ArpOpCaseBuilder();
+        ArpOpBuilder arpOpBuilder = new ArpOpBuilder();
+        arpOpBuilder.setOpCode(53);
+        arpOpCaseBuilder.setArpOp(arpOpBuilder.build());
+        entryBuilder.setMatchEntryValue(arpOpCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(ArpSpa.class);
         entryBuilder.setHasMask(true);
-        ipv4Builder = new Ipv4AddressMatchEntryBuilder();
-        ipv4Builder.setIpv4Address(new Ipv4Address("10.0.0.4"));
-        entryBuilder.addAugmentation(Ipv4AddressMatchEntry.class, ipv4Builder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,16});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        ArpSpaCaseBuilder arpSpaCaseBuilder = new ArpSpaCaseBuilder();
+        ArpSpaBuilder arpSpaBuilder = new ArpSpaBuilder();
+        arpSpaBuilder.setIpv4Address(new Ipv4Address("10.0.0.4"));
+        arpSpaBuilder.setMask(new byte[]{0,0,0,16});
+        arpSpaCaseBuilder.setArpSpa(arpSpaBuilder.build());
+        entryBuilder.setMatchEntryValue(arpSpaCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(ArpTpa.class);
         entryBuilder.setHasMask(true);
-        ipv4Builder = new Ipv4AddressMatchEntryBuilder();
-        ipv4Builder.setIpv4Address(new Ipv4Address("10.0.0.5"));
-        entryBuilder.addAugmentation(Ipv4AddressMatchEntry.class, ipv4Builder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,17});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        ArpTpaCaseBuilder arpTpaCaseBuilder = new ArpTpaCaseBuilder();
+        ArpTpaBuilder arpTpaBuilder = new ArpTpaBuilder();
+        arpTpaBuilder.setIpv4Address(new Ipv4Address("10.0.0.5"));
+        arpTpaBuilder.setMask(new byte[]{0,0,0,17});
+        arpTpaCaseBuilder.setArpTpa(arpTpaBuilder.build());
+        entryBuilder.setMatchEntryValue(arpTpaCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(ArpSha.class);
         entryBuilder.setHasMask(true);
-        macBuilder = new MacAddressMatchEntryBuilder();
-        macBuilder.setMacAddress(new MacAddress("00:01:02:03:04:05"));
-        entryBuilder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,4,0,0,6});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        ArpShaCaseBuilder arpShaCaseBuilder = new ArpShaCaseBuilder();
+        ArpShaBuilder arpShaBuilder = new ArpShaBuilder();
+        arpShaBuilder.setMacAddress(new MacAddress("00:01:02:03:04:05"));
+        arpShaBuilder.setMask(new byte[]{0,0,4,0,0,6});
+        arpShaCaseBuilder.setArpSha(arpShaBuilder.build());
+        entryBuilder.setMatchEntryValue(arpShaCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(ArpTha.class);
         entryBuilder.setHasMask(true);
-        macBuilder = new MacAddressMatchEntryBuilder();
-        macBuilder.setMacAddress(new MacAddress("00:00:00:00:00:03"));
-        entryBuilder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,6,0,0,4});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        ArpThaCaseBuilder arpThaCaseBuilder = new ArpThaCaseBuilder();
+        ArpThaBuilder arpThaBuilder = new ArpThaBuilder();
+        arpThaBuilder.setMacAddress(new MacAddress("00:00:00:00:00:03"));
+        arpThaBuilder.setMask(new byte[]{0,0,6,0,0,4});
+        arpThaCaseBuilder.setArpTha(arpThaBuilder.build());
+        entryBuilder.setMatchEntryValue(arpThaCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6Src.class);
         entryBuilder.setHasMask(true);
-        Ipv6AddressMatchEntryBuilder ipv6Builder = new Ipv6AddressMatchEntryBuilder();
-        ipv6Builder.setIpv6Address(new Ipv6Address("0:0:0:0:0:0:0:1"));
-        entryBuilder.addAugmentation(Ipv6AddressMatchEntry.class, ipv6Builder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        Ipv6SrcCaseBuilder ipv6SrcCaseBuilder = new Ipv6SrcCaseBuilder();
+        Ipv6SrcBuilder ipv6SrcBuilder = new Ipv6SrcBuilder();
+        ipv6SrcBuilder.setIpv6Address(new Ipv6Address("0:0:0:0:0:0:0:1"));
+        ipv6SrcBuilder.setMask(new byte[]{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1});
+        ipv6SrcCaseBuilder.setIpv6Src(ipv6SrcBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6SrcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6Dst.class);
         entryBuilder.setHasMask(true);
-        ipv6Builder = new Ipv6AddressMatchEntryBuilder();
-        ipv6Builder.setIpv6Address(new Ipv6Address("0:0:1:0:1:0:0:1"));
-        entryBuilder.addAugmentation(Ipv6AddressMatchEntry.class, ipv6Builder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        Ipv6DstCaseBuilder ipv6DstCaseBuilder = new Ipv6DstCaseBuilder();
+        Ipv6DstBuilder ipv6DstBuilder = new Ipv6DstBuilder();
+        ipv6DstBuilder.setIpv6Address(new Ipv6Address("0:0:1:0:1:0:0:1"));
+        ipv6DstBuilder.setMask(new byte[]{0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1});
+        ipv6DstCaseBuilder.setIpv6Dst(ipv6DstBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6DstCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6Flabel.class);
-        entryBuilder.setHasMask(true);
-        Ipv6FlabelMatchEntryBuilder flabelBuilder = new Ipv6FlabelMatchEntryBuilder();
-        flabelBuilder.setIpv6Flabel(new Ipv6FlowLabel(58L));
-        entryBuilder.addAugmentation(Ipv6FlabelMatchEntry.class, flabelBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,1,0,2});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        entryBuilder.setHasMask(false);
+        Ipv6FlabelCaseBuilder ipv6FlabelCaseBuilder = new Ipv6FlabelCaseBuilder();
+        Ipv6FlabelBuilder ipv6FlabelBuilder = new Ipv6FlabelBuilder();
+        ipv6FlabelBuilder.setIpv6Flabel(new Ipv6FlowLabel(58L));
+        ipv6FlabelCaseBuilder.setIpv6Flabel(ipv6FlabelBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6FlabelCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Icmpv6Type.class);
         entryBuilder.setHasMask(false);
-        Icmpv6TypeMatchEntryBuilder icmpv6TypeBuilder = new Icmpv6TypeMatchEntryBuilder();
+        Icmpv6TypeCaseBuilder icmpv6TypeCaseBuilder = new Icmpv6TypeCaseBuilder();
+        Icmpv6TypeBuilder icmpv6TypeBuilder = new Icmpv6TypeBuilder();
         icmpv6TypeBuilder.setIcmpv6Type((short) 59);
-        entryBuilder.addAugmentation(Icmpv6TypeMatchEntry.class, icmpv6TypeBuilder.build());
+        icmpv6TypeCaseBuilder.setIcmpv6Type(icmpv6TypeBuilder.build());
+        entryBuilder.setMatchEntryValue(icmpv6TypeCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Icmpv6Code.class);
         entryBuilder.setHasMask(false);
-        Icmpv6CodeMatchEntryBuilder icmpv6CodeBuilder = new Icmpv6CodeMatchEntryBuilder();
-        icmpv6CodeBuilder.setIcmpv6Code((short) 60);
-        entryBuilder.addAugmentation(Icmpv6CodeMatchEntry.class, icmpv6CodeBuilder.build());
+        Icmpv6CodeCaseBuilder Icmpv6CodeCaseBuilder = new Icmpv6CodeCaseBuilder();
+        Icmpv6CodeBuilder Icmpv6CodeBuilder = new Icmpv6CodeBuilder();
+        Icmpv6CodeBuilder.setIcmpv6Code((short) 60);
+        Icmpv6CodeCaseBuilder.setIcmpv6Code(Icmpv6CodeBuilder.build());
+        entryBuilder.setMatchEntryValue(Icmpv6CodeCaseBuilder.build());
         entries.add(entryBuilder.build());
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6NdTarget.class);
         entryBuilder.setHasMask(false);
-        ipv6Builder = new Ipv6AddressMatchEntryBuilder();
-        ipv6Builder.setIpv6Address(new Ipv6Address("F:0:0::0:0:0:1"));
-        entryBuilder.addAugmentation(Ipv6AddressMatchEntry.class, ipv6Builder.build());
+        Ipv6NdTargetCaseBuilder ipv6NdTargetCaseBuilder = new Ipv6NdTargetCaseBuilder();
+        Ipv6NdTargetBuilder ipv6NdTargetBuilder = new Ipv6NdTargetBuilder();
+        ipv6NdTargetBuilder.setIpv6Address(new Ipv6Address("F:0:0::0:0:0:1"));
+        ipv6NdTargetCaseBuilder.setIpv6NdTarget(ipv6NdTargetBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6NdTargetCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6NdSll.class);
         entryBuilder.setHasMask(false);
-        macBuilder = new MacAddressMatchEntryBuilder();
-        macBuilder.setMacAddress(new MacAddress("01:00:03:00:00:06"));
-        entryBuilder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
+        Ipv6NdSllCaseBuilder ipv6NdSllCaseBuilder = new Ipv6NdSllCaseBuilder();
+        Ipv6NdSllBuilder ipv6NdSllBuilder = new Ipv6NdSllBuilder();
+        ipv6NdSllBuilder.setMacAddress(new MacAddress("01:00:03:00:00:06"));
+        ipv6NdSllCaseBuilder.setIpv6NdSll(ipv6NdSllBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6NdSllCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6NdTll.class);
         entryBuilder.setHasMask(false);
-        macBuilder = new MacAddressMatchEntryBuilder();
-        macBuilder.setMacAddress(new MacAddress("04:00:02:00:00:08"));
-        entryBuilder.addAugmentation(MacAddressMatchEntry.class, macBuilder.build());
+        Ipv6NdTllCaseBuilder ipv6NdTllCaseBuilder = new Ipv6NdTllCaseBuilder();
+        Ipv6NdTllBuilder ipv6NdTllBuilder = new Ipv6NdTllBuilder();
+        ipv6NdTllBuilder.setMacAddress(new MacAddress("04:00:02:00:00:08"));
+        ipv6NdTllCaseBuilder.setIpv6NdTll(ipv6NdTllBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6NdTllCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(MplsLabel.class);
         entryBuilder.setHasMask(false);
-        MplsLabelMatchEntryBuilder labelBuilder = new MplsLabelMatchEntryBuilder();
-        labelBuilder.setMplsLabel(61L);
-        entryBuilder.addAugmentation(MplsLabelMatchEntry.class, labelBuilder.build());
+        MplsLabelCaseBuilder mplsLabelCaseBuilder = new MplsLabelCaseBuilder();
+        MplsLabelBuilder mplsLabelBuilder = new MplsLabelBuilder();
+        mplsLabelBuilder.setMplsLabel(61L);
+        mplsLabelCaseBuilder.setMplsLabel(mplsLabelBuilder.build());
+        entryBuilder.setMatchEntryValue(mplsLabelCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(MplsTc.class);
         entryBuilder.setHasMask(false);
-        TcMatchEntryBuilder tcBuilder = new TcMatchEntryBuilder();
-        tcBuilder.setTc((short) 62);
-        entryBuilder.addAugmentation(TcMatchEntry.class, tcBuilder.build());
+        MplsTcCaseBuilder MplsTcCaseBuilder = new MplsTcCaseBuilder();
+        MplsTcBuilder MplsTcBuilder = new MplsTcBuilder();
+        MplsTcBuilder.setTc((short) 62);
+        MplsTcCaseBuilder.setMplsTc(MplsTcBuilder.build());
+        entryBuilder.setMatchEntryValue(MplsTcCaseBuilder.build());
         entries.add(entryBuilder.build());
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(MplsBos.class);
         entryBuilder.setHasMask(false);
-        BosMatchEntryBuilder bosBuilder = new BosMatchEntryBuilder();
-        bosBuilder.setBos(true);
-        entryBuilder.addAugmentation(BosMatchEntry.class, bosBuilder.build());
+        MplsBosCaseBuilder MplsBosCaseBuilder = new MplsBosCaseBuilder();
+        MplsBosBuilder MplsBosBuilder = new MplsBosBuilder();
+        MplsBosBuilder.setBos(true);
+        MplsBosCaseBuilder.setMplsBos(MplsBosBuilder.build());
+        entryBuilder.setMatchEntryValue(MplsBosCaseBuilder.build());
         entries.add(entryBuilder.build());
-        
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(PbbIsid.class);
         entryBuilder.setHasMask(true);
-        IsidMatchEntryBuilder isidBuilder = new IsidMatchEntryBuilder();
-        isidBuilder.setIsid(64L);
-        entryBuilder.addAugmentation(IsidMatchEntry.class, isidBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,1,2});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        PbbIsidCaseBuilder pbbIsidCaseBuilder = new PbbIsidCaseBuilder();
+        PbbIsidBuilder pbbIsidBuilder = new PbbIsidBuilder();
+        pbbIsidBuilder.setIsid(64L);
+        pbbIsidBuilder.setMask(new byte[]{0,1,2});
+        pbbIsidCaseBuilder.setPbbIsid(pbbIsidBuilder.build());
+        entryBuilder.setMatchEntryValue(pbbIsidCaseBuilder.build());
         entries.add(entryBuilder.build());
-        
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(TunnelId.class);
         entryBuilder.setHasMask(true);
-        metadataBuilder = new MetadataMatchEntryBuilder();
-        metadataBuilder.setMetadata(new byte[]{0,0,0,0,0,0,0,1});
-        entryBuilder.addAugmentation(MetadataMatchEntry.class, metadataBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,0,0,0,0,0,0,2});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
+        TunnelIdCaseBuilder tunnelIdCaseBuilder = new TunnelIdCaseBuilder();
+        TunnelIdBuilder tunnelIdBuilder = new TunnelIdBuilder();
+        tunnelIdBuilder.setTunnelId(new byte[]{0,0,0,0,0,0,0,1});
+        tunnelIdBuilder.setMask(new byte[]{0,0,0,0,0,0,0,2});
+        tunnelIdCaseBuilder.setTunnelId(tunnelIdBuilder.build());
+        entryBuilder.setMatchEntryValue(tunnelIdCaseBuilder.build());
         entries.add(entryBuilder.build());
-        
-        entryBuilder = new MatchEntriesBuilder();
+        entryBuilder = new MatchEntryBuilder();
         entryBuilder.setOxmClass(OpenflowBasicClass.class);
         entryBuilder.setOxmMatchField(Ipv6Exthdr.class);
         entryBuilder.setHasMask(true);
-        PseudoFieldMatchEntryBuilder pseudoBuilder = new PseudoFieldMatchEntryBuilder();
-        pseudoBuilder.setPseudoField(new Ipv6ExthdrFlags(true, false, true, false, true, false, true, false, true));
-        entryBuilder.addAugmentation(PseudoFieldMatchEntry.class, pseudoBuilder.build());
-        maskBuilder = new MaskMatchEntryBuilder();
-        maskBuilder.setMask(new byte[]{0,2});
-        entryBuilder.addAugmentation(MaskMatchEntry.class, maskBuilder.build());
-        entries.add(entryBuilder.build());
-        
-        
-        
-        builder.setMatchEntries(entries);
+        Ipv6ExthdrCaseBuilder ipv6ExthdrCaseBuilder = new Ipv6ExthdrCaseBuilder();
+        Ipv6ExthdrBuilder ipv6ExthdrBuilder = new Ipv6ExthdrBuilder();
+        ipv6ExthdrBuilder.setPseudoField(new Ipv6ExthdrFlags(true, false, true,
+                false, true, false, true, false, true));
+        ipv6ExthdrBuilder.setMask(new byte[]{0,2});
+        ipv6ExthdrCaseBuilder.setIpv6Exthdr(ipv6ExthdrBuilder.build());
+        entryBuilder.setMatchEntryValue(ipv6ExthdrCaseBuilder.build());
+        entries.add(entryBuilder.build());
+
+
+        builder.setMatchEntry(entries);
         Match match = builder.build();
-        
+
         ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();
         matchSerializer.serialize(match, out);
-        
+
         Assert.assertEquals("Wrong match type", 1, out.readUnsignedShort());
-        Assert.assertEquals("Wrong match length", 428, out.readUnsignedShort());
+        Assert.assertEquals("Wrong match length", 424, out.readUnsignedShort());
         Assert.assertEquals("Wrong match entry class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong match entry field & hasMask", 0, out.readUnsignedByte());
         Assert.assertEquals("Wrong match entry length", 4, out.readUnsignedByte());
@@ -724,12 +800,9 @@ public class OF13MatchSerializer02Test {
         out.readBytes(array);
         Assert.assertArrayEquals("Wrong match entry mask", new byte[]{0,0,0,0,0,0,0,0,1,0,1,0,0,0,0,1}, array);
         Assert.assertEquals("Wrong match entry class", 0x8000, out.readUnsignedShort());
-        Assert.assertEquals("Wrong match entry field & hasMask", 57, out.readUnsignedByte());
-        Assert.assertEquals("Wrong match entry length", 8, out.readUnsignedByte());
+        Assert.assertEquals("Wrong match entry field & hasMask", 56, out.readUnsignedByte());
+        Assert.assertEquals("Wrong match entry length", 4, out.readUnsignedByte()); //8, out.readUnsignedByte());
         Assert.assertEquals("Wrong match entry value", 58, out.readUnsignedInt());
-        array = new byte[4];
-        out.readBytes(array);
-        Assert.assertArrayEquals("Wrong match entry mask", new byte[]{0,1,0,2}, array);
         Assert.assertEquals("Wrong match entry class", 0x8000, out.readUnsignedShort());
         Assert.assertEquals("Wrong match entry field & hasMask", 58, out.readUnsignedByte());
         Assert.assertEquals("Wrong match entry length", 1, out.readUnsignedByte());
@@ -787,7 +860,7 @@ public class OF13MatchSerializer02Test {
         array = new byte[2];
         out.readBytes(array);
         Assert.assertArrayEquals("Wrong match entry value", new byte[]{0,2}, array);
-        Assert.assertTrue("Wrong padding", out.readableBytes() == 4);
+        Assert.assertTrue("Wrong padding", out.readableBytes() == 0);
     }
 
 }