Bug-5562 - Ipv4 L3-ArbitraryMask patch

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / match / MatchConvertorImplV13Test.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java
index e1e763a7762d21b7e54021256fb1d79e931d26d0..4f3eef615c55048a9fc41cb0b2b12496e3a419bd 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java
@@ -11,6 +11,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.match;
 import java.math.BigInteger;\r
 import java.util.ArrayList;\r
 import java.util.List;\r
+\r
 import org.junit.Assert;\r
 import org.junit.Before;\r
 import org.junit.Test;\r
@@ -166,7 +167,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test(expected = NullPointerException.class)\r
     public void testEmptyMatch() {\r
@@ -176,7 +179,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testEmptyMatchEntry() {\r
@@ -207,7 +212,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testWithMatchEntryNoMasks() {\r
@@ -530,7 +537,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testWithMatchEntryWithMasks() {\r
@@ -661,7 +670,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testWithMatchEntryWithArbitraryMasks() {\r
@@ -701,16 +712,233 @@ public class MatchConvertorImplV13Test {
         final Match match = builder.build();\r
 \r
         final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
-                .MatchBuilder salMatch = MatchConvertorImpl.fromOFMatchToSALMatch(match, new BigInteger("42"), OpenflowVersion.OF10);\r
+                .MatchBuilder salMatch = MatchConvertorImpl.fromOFMatchToSALMatch(match, new BigInteger("42"), OpenflowVersion.OF13);\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match builtMatch = salMatch.build();\r
+\r
+        final Ipv4MatchArbitraryBitMask ipv4MatchArbitraryBitMask = (Ipv4MatchArbitraryBitMask) builtMatch.getLayer3Match();\r
+        Assert.assertEquals("Wrong ipv4 src address", "10.1.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4SourceAddressNoMask().getValue());\r
+        Assert.assertEquals("Wrong ipv4 dst address", "10.0.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4DestinationAddressNoMask().getValue());\r
+    }\r
+\r
+    /**\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     */\r
+    @Test\r
+    public void testWithMatchEntryWithSrcCidrMaskAndDstArbitraryBitMask() {\r
+        final MatchBuilder builder = new MatchBuilder();\r
+        builder.setType(OxmMatchType.class);\r
+        final List<MatchEntry> entries = new ArrayList<>();\r
+        MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);\r
+        entriesBuilder.setHasMask(true);\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Src.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();\r
+        final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();\r
+        ipv4SrcBuilder.setIpv4Address(new Ipv4Address("10.1.1.1"));\r
+        ipv4SrcBuilder.setMask(new byte[]{(byte) 255, (byte) 255, (byte) 255, 0});\r
+        ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Dst.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();\r
+        final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();\r
+        ipv4AddressBuilder.setIpv4Address(new Ipv4Address("10.0.1.1"));\r
+        ipv4AddressBuilder.setMask(new byte[]{(byte) 255, 0, (byte) 240, 0});\r
+        ipv4DstCaseBuilder.setIpv4Dst(ipv4AddressBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        builder.setMatchEntry(entries);\r
+        final Match match = builder.build();\r
+\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
+                .MatchBuilder salMatch = MatchConvertorImpl.fromOFMatchToSALMatch(match, new BigInteger("42"), OpenflowVersion.OF13);\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match builtMatch = salMatch.build();\r
+\r
+        final Ipv4MatchArbitraryBitMask ipv4MatchArbitraryBitMask = (Ipv4MatchArbitraryBitMask) builtMatch.getLayer3Match();\r
+        Assert.assertEquals("Wrong ipv4 src address", "10.1.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4SourceAddressNoMask().getValue());\r
+        Assert.assertEquals("Wrong ipv4 dst address", "10.0.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4DestinationAddressNoMask().getValue());\r
+    }\r
+\r
+    /**\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     */\r
+    @Test\r
+    public void testWithMatchEntryWithSrcArbitraryBitMaskAndDstCidrMask() {\r
+        final MatchBuilder builder = new MatchBuilder();\r
+        builder.setType(OxmMatchType.class);\r
+        final List<MatchEntry> entries = new ArrayList<>();\r
+        MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);\r
+        entriesBuilder.setHasMask(true);\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Src.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();\r
+        final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();\r
+        ipv4SrcBuilder.setIpv4Address(new Ipv4Address("10.1.1.1"));\r
+        ipv4SrcBuilder.setMask(new byte[]{(byte) 255, (byte) 0, (byte) 255, 0});\r
+        ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Dst.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();\r
+        final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();\r
+        ipv4AddressBuilder.setIpv4Address(new Ipv4Address("10.0.1.1"));\r
+        ipv4AddressBuilder.setMask(new byte[]{(byte) 255, (byte) 255, (byte) 240, 0});\r
+        ipv4DstCaseBuilder.setIpv4Dst(ipv4AddressBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        builder.setMatchEntry(entries);\r
+        final Match match = builder.build();\r
+\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
+                .MatchBuilder salMatch = MatchConvertorImpl.fromOFMatchToSALMatch(match, new BigInteger("42"), OpenflowVersion.OF13);\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match builtMatch = salMatch.build();\r
+\r
+        final Ipv4MatchArbitraryBitMask ipv4MatchArbitraryBitMask = (Ipv4MatchArbitraryBitMask) builtMatch.getLayer3Match();\r
+        Assert.assertEquals("Wrong ipv4 src address", "10.1.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4SourceAddressNoMask().getValue());\r
+        Assert.assertEquals("Wrong ipv4 dst address", "10.0.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4DestinationAddressNoMask().getValue());\r
+    }\r
+\r
+\r
+    /**\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     */\r
+    @Test\r
+    public void testWithMatchEntryWithDstArbitraryBitMaskAndSrcCidrMask() {\r
+        final MatchBuilder builder = new MatchBuilder();\r
+        builder.setType(OxmMatchType.class);\r
+        final List<MatchEntry> entries = new ArrayList<>();\r
+        MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);\r
+        entriesBuilder.setHasMask(true);\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Dst.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();\r
+        final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();\r
+        ipv4AddressBuilder.setIpv4Address(new Ipv4Address("10.0.1.1"));\r
+        ipv4AddressBuilder.setMask(new byte[]{(byte) 255, 0, (byte) 240, 0});\r
+        ipv4DstCaseBuilder.setIpv4Dst(ipv4AddressBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Src.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();\r
+        final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();\r
+        ipv4SrcBuilder.setIpv4Address(new Ipv4Address("10.1.1.1"));\r
+        ipv4SrcBuilder.setMask(new byte[]{(byte) 255, (byte) 255, (byte) 255, 0});\r
+        ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        builder.setMatchEntry(entries);\r
+        final Match match = builder.build();\r
+\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
+                .MatchBuilder salMatch = MatchConvertorImpl.fromOFMatchToSALMatch(match, new BigInteger("42"), OpenflowVersion.OF13);\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match builtMatch = salMatch.build();\r
+\r
+        final Ipv4MatchArbitraryBitMask ipv4MatchArbitraryBitMask = (Ipv4MatchArbitraryBitMask) builtMatch.getLayer3Match();\r
+        Assert.assertEquals("Wrong ipv4 src address", "10.1.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4SourceAddressNoMask().getValue());\r
+        Assert.assertEquals("Wrong ipv4 dst address", "10.0.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4DestinationAddressNoMask().getValue());\r
+    }\r
+\r
+    /**\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     */\r
+    @Test\r
+    public void testWithMatchEntryWithDstCidrMaskAndSrcArbitraryBitMask() {\r
+        final MatchBuilder builder = new MatchBuilder();\r
+        builder.setType(OxmMatchType.class);\r
+        final List<MatchEntry> entries = new ArrayList<>();\r
+        MatchEntryBuilder entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.Metadata.class);\r
+        entriesBuilder.setHasMask(true);\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Dst.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4DstCaseBuilder ipv4DstCaseBuilder = new Ipv4DstCaseBuilder();\r
+        final Ipv4DstBuilder ipv4AddressBuilder = new Ipv4DstBuilder();\r
+        ipv4AddressBuilder.setIpv4Address(new Ipv4Address("10.0.1.1"));\r
+        ipv4AddressBuilder.setMask(new byte[]{(byte) 255, (byte) 255, (byte) 240, 0});\r
+        ipv4DstCaseBuilder.setIpv4Dst(ipv4AddressBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4DstCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        entriesBuilder = new MatchEntryBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv4Src.class);\r
+        entriesBuilder.setHasMask(true);\r
+        final Ipv4SrcCaseBuilder ipv4SrcCaseBuilder = new Ipv4SrcCaseBuilder();\r
+        final Ipv4SrcBuilder ipv4SrcBuilder = new Ipv4SrcBuilder();\r
+        ipv4SrcBuilder.setIpv4Address(new Ipv4Address("10.1.1.1"));\r
+        ipv4SrcBuilder.setMask(new byte[]{(byte) 255, (byte) 0, (byte) 255, 0});\r
+        ipv4SrcCaseBuilder.setIpv4Src(ipv4SrcBuilder.build());\r
+        entriesBuilder.setMatchEntryValue(ipv4SrcCaseBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+\r
+        builder.setMatchEntry(entries);\r
+        final Match match = builder.build();\r
+\r
+        final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow\r
+                .MatchBuilder salMatch = MatchConvertorImpl.fromOFMatchToSALMatch(match, new BigInteger("42"), OpenflowVersion.OF13);\r
         final org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match builtMatch = salMatch.build();\r
 \r
         final Ipv4MatchArbitraryBitMask ipv4MatchArbitraryBitMask = (Ipv4MatchArbitraryBitMask) builtMatch.getLayer3Match();\r
-        Assert.assertEquals("Wrong ipv4 src address", "10.1.1.1", ipv4MatchArbitraryBitMask.getIpv4SourceAddressNoMask().getValue());\r
-        Assert.assertEquals("Wrong ipv4 dst address", "10.0.1.1", ipv4MatchArbitraryBitMask.getIpv4DestinationAddressNoMask().getValue());\r
+        Assert.assertEquals("Wrong ipv4 src address", "10.1.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4SourceAddressNoMask().getValue());\r
+        Assert.assertEquals("Wrong ipv4 dst address", "10.0.1.1",\r
+                ipv4MatchArbitraryBitMask.getIpv4DestinationAddressNoMask().getValue());\r
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testLayer4MatchUdp() {\r
@@ -753,7 +981,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testLayer4MatchSctp() {\r
@@ -796,7 +1026,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testLayer3MatchIpv6() {\r
@@ -899,7 +1131,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testLayer3MatchIpv6ExtHeader2() {\r
@@ -929,7 +1163,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testLayer3MatchArp() {\r
@@ -1005,7 +1241,9 @@ public class MatchConvertorImplV13Test {
     }\r
 \r
     /**\r
-     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger, org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
+     * Test {@link MatchConvertorImpl#fromOFMatchToSALMatch(\r
+     * org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.grouping.Match, java.math.BigInteger,\r
+     * org.opendaylight.openflowplugin.api.openflow.md.util.OpenflowVersion)}\r
      */\r
     @Test\r
     public void testLayer3MatchArpWithMasks() {\r