X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=mappingservice%2Flisp-proto%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Flispflowmapping%2Flisp%2Fserializer%2Faddress%2FApplicationDataSerializer.java;h=da276104c270f5a688d235ce46f9841ff47ef830;hb=4a99f1d24037d5b7947658b7360a8c53baeedbf6;hp=c1e6d302a0a8294d6df5afad0dd2562bce9b8779;hpb=2f59fc2aa0459f79de5a441b06850cc2d017ecc8;p=lispflowmapping.git

diff --git a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java
index c1e6d302a..da276104c 100644
--- a/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java
+++ b/mappingservice/lisp-proto/src/main/java/org/opendaylight/lispflowmapping/lisp/serializer/address/ApplicationDataSerializer.java
@@ -7,13 +7,15 @@
  */
 package org.opendaylight.lispflowmapping.lisp.serializer.address;
 
+import static org.opendaylight.yangtools.yang.common.UintConversions.fromJava;
+
 import java.nio.ByteBuffer;
 
 import org.opendaylight.lispflowmapping.lisp.type.LispCanonicalAddressFormatEnum;
 import org.opendaylight.lispflowmapping.lisp.util.ByteUtil;
 import org.opendaylight.lispflowmapping.lisp.util.NumberUtil;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana.afn.safi.rev130704.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.ApplicationDataLcaf;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.LispAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105.SimpleAddress;
@@ -59,7 +61,7 @@ public final class ApplicationDataSerializer extends LcafSerializer {
         ApplicationData appData = ((org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types
                 .rev151105.lisp.address.address.ApplicationData) lispAddress.getAddress()).getApplicationData();
         buffer.put(ByteUtil.partialIntToByteArray(NumberUtil.asInt(appData.getIpTos()), Length.TOC));
-        buffer.put((byte) NumberUtil.asShort(appData.getProtocol()));
+        buffer.put((byte) NumberUtil.asShort(appData.getProtocol().toJava()));
         if (appData.getLocalPortLow() != null) {
             buffer.putShort(NumberUtil.asShort(appData.getLocalPortLow().getValue().shortValue()));
         } else {
@@ -107,11 +109,11 @@ public final class ApplicationDataSerializer extends LcafSerializer {
         byte[] rawIPTos = new byte[3];
         buffer.get(rawIPTos);
         builder.setIpTos(ByteUtil.getPartialInt(rawIPTos));
-        builder.setProtocol((short) ByteUtil.getUnsignedByte(buffer));
-        builder.setLocalPortLow(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
-        builder.setLocalPortHigh(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
-        builder.setRemotePortLow(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
-        builder.setRemotePortHigh(new PortNumber(ByteUtil.asUnsignedShort(buffer.getShort())));
+        builder.setProtocol(fromJava((short) ByteUtil.getUnsignedByte(buffer)));
+        builder.setLocalPortLow(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
+        builder.setLocalPortHigh(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
+        builder.setRemotePortLow(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
+        builder.setRemotePortHigh(new PortNumber(fromJava(ByteUtil.asUnsignedShort(buffer.getShort()))));
         SimpleAddress address = SimpleAddressSerializer.getInstance().deserialize(buffer, ctx);
         builder.setAddress(address);
         return new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105