commit 3c2d3eba52eef561b8224293f09f8a406a5c62c2
author Avantika-Huawei <avantika.s@huawei.com> Wed Jun 22 09:34:00 2016 +0530
committer Avantika-Huawei <avantika.s@huawei.com> Wed Jun 22 07:12:13 2016 +0000
tree 9dcdc696e4dbd3ca5592ed494a1b3ddefd5dd6e1
parent f849aaba05d10f6564aa08a63ec637425c01f7ac

[ONOS-4722] cherry-picked GoldenEye:Fix exception on learning unknown PCE-initiated LSP from PCC

Change-Id: I8abc003aeb187f18e51de533f0c51e265dfd8661

protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java

diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java
index ba5dd1a..1f7bebb 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/NexthopIPv4addressTlv.java
@@ -36,7 +36,7 @@
         0                   1                   2                     3
         0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-       | Type=TBD                      | Length = 8                    |
+       | Type=TBD                      |          Length = 4           |
        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
        |                     nexthop IPv4 address                      |
        +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -46,7 +46,7 @@
      */
     protected static final Logger log = LoggerFactory.getLogger(NexthopIPv4addressTlv.class);
 
-    public static final short TYPE = 2; //to be defined
+    public static final short TYPE = (short) 65289; //to be defined
     //Length is header + value
     public static final short LENGTH = 8;
     public static final short VALUE_LENGTH = 4;
@@ -93,7 +93,7 @@
 
     @Override
     public short getLength() {
-        return LENGTH;
+        return VALUE_LENGTH;
     }
 
     @Override
@@ -117,7 +117,7 @@
     public int write(ChannelBuffer c) {
         int iStartIndex = c.writerIndex();
         c.writeShort(TYPE);
-        c.writeShort(LENGTH);
+        c.writeShort(VALUE_LENGTH);
         c.writeInt(rawValue);
         return c.writerIndex() - iStartIndex;
     }
@@ -136,7 +136,7 @@
     public String toString() {
         return MoreObjects.toStringHelper(getClass())
                 .add("Type", TYPE)
-                .add("Length", LENGTH)
+                .add("Length", VALUE_LENGTH)
                 .add("Ipv4Address ", rawValue)
                 .toString();
     }