Bug 2756 - Match model update

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / match / AbstractOxmIpv6AddressSerializer.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java
index 496505b89cb3e999f04bf25e100997c33a40933e..9fa730bdc95670f889d77f4f3181c4c0e38c2bec 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv6AddressSerializer.java
@@ -13,10 +13,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.opendaylight.openflowjava.util.ByteBufUtils;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv6AddressMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
+import org.opendaylight.openflowjava.util.ByteBufUtils;
 
 import com.google.common.collect.Lists;
 
@@ -26,10 +24,7 @@ import com.google.common.collect.Lists;
  */
 public abstract class AbstractOxmIpv6AddressSerializer extends AbstractOxmMatchEntrySerializer {
 
-    @Override
-    public void serialize(final MatchEntries entry, final ByteBuf outBuffer) {
-        super.serialize(entry, outBuffer);
-        String textAddress = entry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address().getValue();
+    protected void writeIpv6Address(String textAddress, final ByteBuf outBuffer) {
         List<String> address;
         if (textAddress.equals("::")) {
             String[] tmp = new String[EncodeConstants.GROUPS_IN_IPV6_ADDRESS];
@@ -41,7 +36,6 @@ public abstract class AbstractOxmIpv6AddressSerializer extends AbstractOxmMatchE
         for (String group : address) {
             outBuffer.writeShort(Integer.parseInt(group, 16));
         }
-        writeMask(entry, outBuffer, getValueLength());
     }
 
     private static List<String> parseIpv6Address(final List<String> addressGroups) {