X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflow-protocol-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Fmatch%2FOxmArpShaDeserializer.java;h=91b4514e6a55a23c556b4d5ab98a0ce2f609afd7;hb=29a2a074c78708f6d18583779ece96bb6573f0c6;hp=b26b9e3a041ce9a8b93891fbce7371fb233aba1c;hpb=519a86d1ddcfb8f0fe264174e62e5424e1efba1f;p=openflowjava.git

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java
index b26b9e3a..91b4514e 100644
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/match/OxmArpShaDeserializer.java
@@ -7,16 +7,43 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.deserialization.match;
 
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.ArpSha;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.MatchField;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OpenflowBasicClass;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.OxmClassBase;
+import io.netty.buffer.ByteBuf;
+
+import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.ArpSha;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.MatchField;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OpenflowBasicClass;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.OxmClassBase;
+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.ArpShaCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entry.value.grouping.match.entry.value.arp.sha._case.ArpShaBuilder;
 
 /**
  * @author michal.polkorab
  *
  */
-public class OxmArpShaDeserializer extends AbstractOxmMacAddressDeserializer {
+public class OxmArpShaDeserializer extends AbstractOxmMatchEntryDeserializer
+        implements OFDeserializer<MatchEntry> {
+
+    @Override
+    public MatchEntry deserialize(ByteBuf input) {
+        MatchEntryBuilder builder = processHeader(getOxmClass(), getOxmField(), input);
+        addArpShaValue(input, builder);
+        return builder.build();
+    }
+
+    private static void addArpShaValue(ByteBuf input, MatchEntryBuilder builder) {
+        ArpShaCaseBuilder caseBuilder = new ArpShaCaseBuilder();
+        ArpShaBuilder shaBuilder = new ArpShaBuilder();
+        shaBuilder.setMacAddress(OxmDeserializerHelper.convertMacAddress(input));
+        if (builder.isHasMask()) {
+            shaBuilder.setMask(OxmDeserializerHelper.convertMask(input, EncodeConstants.MAC_ADDRESS_LENGTH));
+        }
+        caseBuilder.setArpSha(shaBuilder.build());
+        builder.setMatchEntryValue(caseBuilder.build());
+    }
 
     @Override
     protected Class<? extends MatchField> getOxmField() {