X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Futil%2FMatchDeserializerTest.java;h=36d9a9ce8be68c37aff873a00122bbdc7382a13b;hb=7a606fd03c9ea9dc7500b88cddb8ce6e6c6e831c;hp=d4cdc802ae75c6fe272819d6c8995cdb36c71c72;hpb=1af28ce842ef5a96ad1293c8db0a6cb494c1fbdc;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java
index d4cdc802..36d9a9ce 100644
--- a/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java
+++ b/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/util/MatchDeserializerTest.java
@@ -15,10 +15,13 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
-import org.opendaylight.openflowjava.protocol.api.extensibility.EnhancedMessageCodeKey;
+import org.opendaylight.openflowjava.protocol.api.extensibility.HeaderDeserializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.MessageCodeKey;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.api.keys.MatchEntryDeserializerKey;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.impl.deserialization.DeserializerRegistryImpl;
+import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
 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.yang.types.rev100924.MacAddress;
@@ -47,6 +50,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanPcpMatchEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.VlanVidMatchEntry;
 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.StandardMatchType;
 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;
@@ -120,8 +124,10 @@ public class MatchDeserializerTest {
     public void testIpv4Address() {
         ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 18 04 00 01 02 03");
 
-        OFDeserializer<MatchEntries> entryDeserializer = registry.getDeserializer(
-                new EnhancedMessageCodeKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 12, MatchEntries.class));
+        MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
+                0x8000, 12);
+        key.setExperimenterId(null);
+        OFDeserializer<MatchEntries> entryDeserializer = registry.getDeserializer(key);
         MatchEntries entry = entryDeserializer.deserialize(buffer);
         Assert.assertEquals("Wrong Ipv4 address format", new Ipv4Address("0.1.2.3"),
                 entry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address());
@@ -134,8 +140,10 @@ public class MatchDeserializerTest {
     public void testIpv6Address() {
         ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 34 10 00 00 00 01 00 02 00 03 00 04 00 05 00 06 0F 07");
         
-        OFDeserializer<MatchEntries> entryDeserializer = registry.getDeserializer(
-                new EnhancedMessageCodeKey(EncodeConstants.OF13_VERSION_ID, 0x8000, 26, MatchEntries.class));
+        MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
+                0x8000, 26);
+        key.setExperimenterId(null);
+        OFDeserializer<MatchEntries> entryDeserializer = registry.getDeserializer(key);
         MatchEntries entry = entryDeserializer.deserialize(buffer);
         Assert.assertEquals("Wrong Ipv6 address format", new Ipv6Address("0000:0001:0002:0003:0004:0005:0006:0F07"),
                 entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address());
@@ -188,7 +196,7 @@ public class MatchDeserializerTest {
                 + "80 00 48 01 01 "
                 + "80 00 4B 06 00 00 02 00 00 01 "
                 + "80 00 4D 10 00 00 00 00 00 00 00 07 00 00 00 00 00 00 00 FF "
-                + "80 00 4F 04 01 66 03 04 "
+                + "80 00 4F 04 00 00 03 04 "
                 + "00 00 00 00");
 
         Match match = matchDeserializer.deserialize(buffer);
@@ -468,11 +476,41 @@ public class MatchDeserializerTest {
         Assert.assertEquals("Wrong entry field", Ipv6Exthdr.class, entry39.getOxmMatchField());
         Assert.assertEquals("Wrong entry hasMask", true, entry39.isHasMask());
         Assert.assertEquals("Wrong entry value",
-                new Ipv6ExthdrFlags(true, false, true, false, true, false, true, false, true),
+                new Ipv6ExthdrFlags(false, false, false, false, false, false, false, false, false),
                 entry39.getAugmentation(PseudoFieldMatchEntry.class).getPseudoField());
         Assert.assertArrayEquals("Wrong entry mask", ByteBufUtils.hexStringToBytes("03 04"),
                 entry39.getAugmentation(MaskMatchEntry.class).getMask());
         Assert.assertTrue("Unread data", buffer.readableBytes() == 0);
     }
 
-}
+    /**
+     * Testing header deserialization
+     */
+    @Test
+    public void testHeaders() {
+        ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("80 00 18 04 00 01 02 03");
+
+        MatchEntryDeserializerKey key = new MatchEntryDeserializerKey(EncodeConstants.OF13_VERSION_ID,
+                0x8000, 12);
+        key.setExperimenterId(null);
+        HeaderDeserializer<MatchEntries> entryDeserializer = registry.getDeserializer(key);
+        MatchEntries entry = entryDeserializer.deserializeHeader(buffer);
+        Assert.assertEquals("Wrong entry class", OpenflowBasicClass.class, entry.getOxmClass());
+        Assert.assertEquals("Wrong entry field", Ipv4Dst.class, entry.getOxmMatchField());
+        Assert.assertEquals("Wrong entry hasMask", false, entry.isHasMask());
+        Assert.assertEquals("Wrong Ipv4 address", null, entry.getAugmentation(Ipv4AddressMatchEntry.class));
+    }
+
+    /**
+     * Testing standard match type
+     */
+    @Test
+    public void testStandardMatch() {
+        ByteBuf buffer = ByteBufUtils.hexStringToByteBuf("00 00 00 10 80 00 04 08 00 00 00 00 00 00 00 01");
+
+        Match match = matchDeserializer.deserialize(buffer);
+
+        Assert.assertEquals("Wrong match type", StandardMatchType.class, match.getType());
+        Assert.assertEquals("Wrong match entries size", 1, match.getMatchEntries().size());
+    }
+}
\ No newline at end of file