Merge "OF1.3 matchSerializer (Ipv6 address) fix + test"

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
index bde832c0206aae3ab089da9dd8e00c51cbd5e56e..557ff7bca2b8cef9aff540badd36acdc6b5f1e5c 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializer.java
@@ -441,22 +441,28 @@ public class MatchSerializer {
 \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
+        String textAddress = entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address().getValue();\r
+        String[] address;\r
+        if (textAddress.equals("::")) {\r
+            address = new String[EncodeConstants.GROUPS_IN_IPV6_ADDRESS];\r
+            Arrays.fill(address, "0");\r
+        } else {\r
+            address = parseIpv6Address(textAddress.split(":"));\r
+        }\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
+                out.writeShort(Integer.parseInt(address[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
+            for (int i = 0; i < address.length; i++) {\r
+                out.writeShort(Integer.parseInt(address[i], 16));\r
             }\r
         }\r
     }\r
@@ -475,15 +481,16 @@ public class MatchSerializer {
             break;\r
         case 1:\r
             int zerosToBePushed = EncodeConstants.GROUPS_IN_IPV6_ADDRESS - addressGroups.length + 1;\r
-            int pushed = 0;\r
+            int index = 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
+                        ready[index] = "0";\r
+                        index++;\r
                     }\r
                 } else {\r
-                    ready[i + pushed] = addressGroups[i];\r
+                    ready[index] = addressGroups[i];\r
+                    index++;\r
                 }\r
             }\r
             break;\r
@@ -491,12 +498,8 @@ public class MatchSerializer {
             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
+            throw new IllegalStateException("Incorrect ipv6 address");\r
         }\r
         return ready;\r
     }\r

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializerTest.java
index 1fbed39cc33ec43f290f7d4915403513b1e2f7bd..67d148fb935006f5d998739f1639b533fa67fe58 100644 (file)
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchSerializerTest.java
@@ -10,9 +10,17 @@ import java.util.List;
 import org.junit.Assert;\r
 import org.junit.Test;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;\r
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;\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.Ipv4AddressMatchEntryBuilder;\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.Ipv6AddressMatchEntryBuilder;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv4Src;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Dst;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6NdTarget;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Ipv6Src;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Nxm0Class;\r
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.Nxm1Class;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OxmMatchType;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.MatchEntries;\r
@@ -58,5 +66,142 @@ public class MatchSerializerTest {
         Assert.assertEquals("Wrong ip address (third number)", 3, out.readUnsignedByte());\r
         Assert.assertEquals("Wrong ip address (fourth number)", 4, out.readUnsignedByte());\r
     }\r
+    \r
+    /**\r
+     * Test for correct serialization of Ipv6Address match entry\r
+     */\r
+    @Test\r
+    public void test2() {\r
+        MatchBuilder builder = new MatchBuilder();\r
+        builder.setType(OxmMatchType.class);\r
+        List<MatchEntries> entries = new ArrayList<>();\r
+        // ipv6 match entry with correct Ipv6 address\r
+        MatchEntriesBuilder entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv6Src.class);\r
+        entriesBuilder.setHasMask(false);\r
+        Ipv6AddressMatchEntryBuilder addressBuilder = new Ipv6AddressMatchEntryBuilder();\r
+        addressBuilder.setIpv6Address(new Ipv6Address("1:2:3:4:5:6:7:8"));\r
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        // ipv6 match entry with abbreviated Ipv6 address\r
+        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv6NdTarget.class);\r
+        entriesBuilder.setHasMask(false);\r
+        addressBuilder = new Ipv6AddressMatchEntryBuilder();\r
+        addressBuilder.setIpv6Address(new Ipv6Address("1:2::6:7:8"));\r
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        // ipv6 match entry with abbreviated Ipv6 address\r
+        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(Nxm1Class.class);\r
+        entriesBuilder.setOxmMatchField(Ipv6Dst.class);\r
+        entriesBuilder.setHasMask(false);\r
+        addressBuilder = new Ipv6AddressMatchEntryBuilder();\r
+        addressBuilder.setIpv6Address(new Ipv6Address("1::8"));\r
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        // ipv6 match entry with abbreviated Ipv6 address\r
+        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(Nxm1Class.class);\r
+        entriesBuilder.setOxmMatchField(Ipv6Dst.class);\r
+        entriesBuilder.setHasMask(false);\r
+        addressBuilder = new Ipv6AddressMatchEntryBuilder();\r
+        addressBuilder.setIpv6Address(new Ipv6Address("::1"));\r
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        // ipv6 match entry with abbreviated Ipv6 address\r
+        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(Nxm0Class.class);\r
+        entriesBuilder.setOxmMatchField(Ipv6Dst.class);\r
+        entriesBuilder.setHasMask(false);\r
+        addressBuilder = new Ipv6AddressMatchEntryBuilder();\r
+        addressBuilder.setIpv6Address(new Ipv6Address("::"));\r
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        // ipv6 match entry with incorrect Ipv6 address (longer)\r
+        entriesBuilder = new MatchEntriesBuilder();\r
+        entriesBuilder.setOxmClass(OpenflowBasicClass.class);\r
+        entriesBuilder.setOxmMatchField(Ipv6Dst.class);\r
+        entriesBuilder.setHasMask(false);\r
+        addressBuilder = new Ipv6AddressMatchEntryBuilder();\r
+        addressBuilder.setIpv6Address(new Ipv6Address("1:2:3:4:5:6:7:8:9"));\r
+        entriesBuilder.addAugmentation(Ipv6AddressMatchEntry.class, addressBuilder.build());\r
+        entries.add(entriesBuilder.build());\r
+        builder.setMatchEntries(entries);\r
+        Match match = builder.build();\r
+        ByteBuf out = UnpooledByteBufAllocator.DEFAULT.buffer();\r
+        MatchSerializer.encodeMatch(match, out);\r
+        \r
+        Assert.assertEquals("Wrong type", 1, out.readUnsignedShort());\r
+        out.skipBytes(EncodeConstants.SIZE_OF_SHORT_IN_BYTES);\r
+        Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong field and mask", 52, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong ipv6 address", 1, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 2, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 3, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 4, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 5, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 6, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 7, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 8, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong field and mask", 62, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong ipv6 address", 1, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 2, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 6, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 7, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 8, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong class", 0x0001, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong field and mask", 54, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong ipv6 address", 1, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 8, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong class", 0x0001, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong field and mask", 54, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 1, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong class", 0x0000, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong field and mask", 54, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 0, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong class", 0x8000, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong field and mask", 54, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong entry length", 16, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong ipv6 address", 1, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 2, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 3, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 4, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 5, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 6, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 7, out.readUnsignedShort());\r
+        Assert.assertEquals("Wrong ipv6 address", 8, out.readUnsignedShort());\r
+    }\r
 \r
 }\r