홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
bharat saraswal
Committed by Ray Milkey
b4e5cbee 1 parent 5eab857b

Test cases renamed and fixed. 

Change-Id: I8b8134bbb0300029b83bf0804bdc6d97b7cec43f
Inline Side-by-side
Showing 12 changed files with 279 additions and 316 deletions
...@@ -296,8 +296,7 @@ public class PcepTEObjectVer1 implements PcepTEObject { ...@@ -296,8 +296,7 @@ public class PcepTEObjectVer1 implements PcepTEObject {
296 tlv = LocalTENodeDescriptorsTLV.read(cb, hLength); 296 tlv = LocalTENodeDescriptorsTLV.read(cb, hLength);
297 break; 297 break;
298 case RemoteTENodeDescriptorsTLV.TYPE: 298 case RemoteTENodeDescriptorsTLV.TYPE:
299 - RemoteTENodeDescriptorsTLV.hLength = hLength; 299 + tlv = RemoteTENodeDescriptorsTLV.read(cb, hLength);
300 - tlv = RemoteTENodeDescriptorsTLV.read(cb);
301 break; 300 break;
302 case TELinkDescriptorsTLV.TYPE: 301 case TELinkDescriptorsTLV.TYPE:
303 tlv = TELinkDescriptorsTLV.read(cb, hLength); 302 tlv = TELinkDescriptorsTLV.read(cb, hLength);
......
...@@ -169,7 +169,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType { ...@@ -169,7 +169,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
169 } 169 }
170 } 170 }
171 hLength = (short) (c.writerIndex() - tlvStartIndex); 171 hLength = (short) (c.writerIndex() - tlvStartIndex);
172 - c.setShort(tlvLenIndex, hLength); 172 + c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
173 return c.writerIndex() - tlvStartIndex; 173 return c.writerIndex() - tlvStartIndex;
174 } 174 }
175 175
...@@ -186,7 +186,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType { ...@@ -186,7 +186,7 @@ public class LocalTENodeDescriptorsTLV implements PcepValueType {
186 // Node Descriptor Sub-TLVs (variable) 186 // Node Descriptor Sub-TLVs (variable)
187 LinkedList<PcepValueType> llNodeDescriptorSubTLVs = new LinkedList<PcepValueType>(); 187 LinkedList<PcepValueType> llNodeDescriptorSubTLVs = new LinkedList<PcepValueType>();
188 188
189 - ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH); 189 + ChannelBuffer tempCb = c.readBytes(hLength);
190 190
191 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) { 191 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
192 192
......
...@@ -116,40 +116,38 @@ public class PcepRsvpSpecObjHeader { ...@@ -116,40 +116,38 @@ public class PcepRsvpSpecObjHeader {
116 /** 116 /**
117 * Writes the byte stream of PcepRsvpObjectHeader to channel buffer. 117 * Writes the byte stream of PcepRsvpObjectHeader to channel buffer.
118 * 118 *
119 - * @param bb of type channel buffer 119 + * @param cb of type channel buffer
120 * @return object length index 120 * @return object length index
121 */ 121 */
122 - public int write(ChannelBuffer bb) { 122 + public int write(ChannelBuffer cb) {
123 - int objLenIndex = bb.writerIndex(); 123 + int objLenIndex = cb.writerIndex();
124 - bb.writeShort(objLen); 124 + objLen = 0;
125 - bb.writeByte(objClassNum); 125 + cb.writeShort(objLen);
126 - bb.writeByte(objClassType); 126 + cb.writeByte(objClassNum);
127 - return bb.writerIndex() - objLenIndex; 127 + cb.writeByte(objClassType);
128 + return objLenIndex;
128 } 129 }
129 130
130 /** 131 /**
131 * Reads the PcepRsvpObjectHeader. 132 * Reads the PcepRsvpObjectHeader.
132 * 133 *
133 - * @param bb of type channel buffer 134 + * @param cb of type channel buffer
134 * @return PcepRsvpObjectHeader 135 * @return PcepRsvpObjectHeader
135 */ 136 */
136 - public static PcepRsvpSpecObjHeader read(ChannelBuffer bb) { 137 + public static PcepRsvpSpecObjHeader read(ChannelBuffer cb) {
137 byte objClassNum; 138 byte objClassNum;
138 byte objClassType; 139 byte objClassType;
139 short objLen; 140 short objLen;
140 - objLen = bb.readShort(); 141 + objLen = cb.readShort();
141 - objClassNum = bb.readByte(); 142 + objClassNum = cb.readByte();
142 - objClassType = bb.readByte(); 143 + objClassType = cb.readByte();
143 144
144 return new PcepRsvpSpecObjHeader(objLen, objClassNum, objClassType); 145 return new PcepRsvpSpecObjHeader(objLen, objClassNum, objClassType);
145 } 146 }
146 147
147 @Override 148 @Override
148 public String toString() { 149 public String toString() {
149 - return MoreObjects.toStringHelper(getClass()) 150 + return MoreObjects.toStringHelper(getClass()).add("ObjectClassNum: ", objClassNum)
150 - .add("ObjectClassNum: " , objClassNum) 151 + .add("ObjectCType: ", objClassType).add("ObjectLength: ", objLen).toString();
151 - .add("ObjectCType: " , objClassType)
152 - .add("ObjectLength: " , objLen)
153 - .toString();
154 } 152 }
155 } 153 }
......
...@@ -50,7 +50,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType { ...@@ -50,7 +50,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
50 protected static final Logger log = LoggerFactory.getLogger(RemoteTENodeDescriptorsTLV.class); 50 protected static final Logger log = LoggerFactory.getLogger(RemoteTENodeDescriptorsTLV.class);
51 51
52 public static final short TYPE = 1003; //TODD:change this TBD9 52 public static final short TYPE = 1003; //TODD:change this TBD9
53 - public static short hLength; 53 + public short hLength;
54 54
55 public static final int TLV_HEADER_LENGTH = 4; 55 public static final int TLV_HEADER_LENGTH = 4;
56 // Node Descriptor Sub-TLVs (variable) 56 // Node Descriptor Sub-TLVs (variable)
...@@ -172,7 +172,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType { ...@@ -172,7 +172,7 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
172 } 172 }
173 173
174 hLength = (short) (c.writerIndex() - tlvStartIndex); 174 hLength = (short) (c.writerIndex() - tlvStartIndex);
175 - c.setShort(tlvLenIndex, hLength); 175 + c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
176 176
177 return c.writerIndex() - tlvStartIndex; 177 return c.writerIndex() - tlvStartIndex;
178 } 178 }
...@@ -184,12 +184,12 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType { ...@@ -184,12 +184,12 @@ public class RemoteTENodeDescriptorsTLV implements PcepValueType {
184 * @return object of RemoteTENodeDescriptorsTLV 184 * @return object of RemoteTENodeDescriptorsTLV
185 * @throws PcepParseException if mandatory fields are missing 185 * @throws PcepParseException if mandatory fields are missing
186 */ 186 */
187 - public static PcepValueType read(ChannelBuffer c) throws PcepParseException { 187 + public static PcepValueType read(ChannelBuffer c , short length) throws PcepParseException {
188 188
189 // Node Descriptor Sub-TLVs (variable) 189 // Node Descriptor Sub-TLVs (variable)
190 LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs = new LinkedList<PcepValueType>(); 190 LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs = new LinkedList<PcepValueType>();
191 191
192 - ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH); 192 + ChannelBuffer tempCb = c.readBytes(length);
193 193
194 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) { 194 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
195 195
......
...@@ -104,7 +104,7 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType { ...@@ -104,7 +104,7 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType {
104 104
105 public static final short TYPE = 21; 105 public static final short TYPE = 21;
106 public static final int OBJECT_HEADER_LENGTH = 4; 106 public static final int OBJECT_HEADER_LENGTH = 4;
107 - private final short hLength; 107 + private short hLength;
108 108
109 private final PcepRsvpErrorSpec rsvpErrSpecObj; 109 private final PcepRsvpErrorSpec rsvpErrSpecObj;
110 private final boolean isErrSpceObjSet; 110 private final boolean isErrSpceObjSet;
...@@ -113,12 +113,10 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType { ...@@ -113,12 +113,10 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType {
113 * Constructor to initialize errSpecObj. 113 * Constructor to initialize errSpecObj.
114 * 114 *
115 * @param rsvpErrSpecObj Rsvp error spec object 115 * @param rsvpErrSpecObj Rsvp error spec object
116 - * @param hLength length of rsvp error spec object
117 */ 116 */
118 - public StatefulRsvpErrorSpecTlv(PcepRsvpErrorSpec rsvpErrSpecObj, short hLength) { 117 + public StatefulRsvpErrorSpecTlv(PcepRsvpErrorSpec rsvpErrSpecObj) {
119 this.rsvpErrSpecObj = rsvpErrSpecObj; 118 this.rsvpErrSpecObj = rsvpErrSpecObj;
120 this.isErrSpceObjSet = true; 119 this.isErrSpceObjSet = true;
121 - this.hLength = hLength;
122 } 120 }
123 121
124 /** 122 /**
...@@ -171,7 +169,7 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType { ...@@ -171,7 +169,7 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType {
171 && PcepRsvpUserErrorSpec.CLASS_TYPE == rsvpErrSpecObjHeader.getObjClassType()) { 169 && PcepRsvpUserErrorSpec.CLASS_TYPE == rsvpErrSpecObjHeader.getObjClassType()) {
172 rsvpErrSpecObj = PcepRsvpUserErrorSpec.read(cb); 170 rsvpErrSpecObj = PcepRsvpUserErrorSpec.read(cb);
173 } 171 }
174 - return rsvpErrSpecObj; 172 + return new StatefulRsvpErrorSpecTlv(rsvpErrSpecObj);
175 } 173 }
176 174
177 @Override 175 @Override
...@@ -196,14 +194,15 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType { ...@@ -196,14 +194,15 @@ public class StatefulRsvpErrorSpecTlv implements PcepValueType {
196 int iStartIndex = c.writerIndex(); 194 int iStartIndex = c.writerIndex();
197 c.writeShort(TYPE); 195 c.writeShort(TYPE);
198 int tlvLenIndex = c.writerIndex(); 196 int tlvLenIndex = c.writerIndex();
197 + hLength = 0;
199 c.writeShort(hLength); 198 c.writeShort(hLength);
200 if (isErrSpceObjSet) { 199 if (isErrSpceObjSet) {
201 rsvpErrSpecObj.write(c); 200 rsvpErrSpecObj.write(c);
202 } 201 }
203 - short tlvLen = (short) (c.writerIndex() - iStartIndex + 4); 202 + hLength = (short) (c.writerIndex() - iStartIndex);
204 - c.setShort(tlvLenIndex, tlvLen); 203 + c.setShort(tlvLenIndex, (hLength - OBJECT_HEADER_LENGTH));
205 204
206 - return tlvLen; 205 + return c.writerIndex() - iStartIndex;
207 } 206 }
208 207
209 @Override 208 @Override
......
...@@ -63,7 +63,6 @@ public class TELinkAttributesTlv implements PcepValueType { ...@@ -63,7 +63,6 @@ public class TELinkAttributesTlv implements PcepValueType {
63 */ 63 */
64 public TELinkAttributesTlv(LinkedList<PcepValueType> llLinkAttributesSubTLVs) { 64 public TELinkAttributesTlv(LinkedList<PcepValueType> llLinkAttributesSubTLVs) {
65 this.llLinkAttributesSubTLVs = llLinkAttributesSubTLVs; 65 this.llLinkAttributesSubTLVs = llLinkAttributesSubTLVs;
66 -
67 } 66 }
68 67
69 /** 68 /**
...@@ -171,7 +170,7 @@ public class TELinkAttributesTlv implements PcepValueType { ...@@ -171,7 +170,7 @@ public class TELinkAttributesTlv implements PcepValueType {
171 } 170 }
172 171
173 hLength = (short) (c.writerIndex() - tlvStartIndex); 172 hLength = (short) (c.writerIndex() - tlvStartIndex);
174 - c.setShort(tlvLenIndex, hLength); 173 + c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
175 174
176 return c.writerIndex() - tlvStartIndex; 175 return c.writerIndex() - tlvStartIndex;
177 } 176 }
...@@ -189,7 +188,7 @@ public class TELinkAttributesTlv implements PcepValueType { ...@@ -189,7 +188,7 @@ public class TELinkAttributesTlv implements PcepValueType {
189 // Node Descriptor Sub-TLVs (variable) 188 // Node Descriptor Sub-TLVs (variable)
190 LinkedList<PcepValueType> llLinkAttributesSubTLVs = new LinkedList<PcepValueType>(); 189 LinkedList<PcepValueType> llLinkAttributesSubTLVs = new LinkedList<PcepValueType>();
191 190
192 - ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH); 191 + ChannelBuffer tempCb = c.readBytes(hLength);
193 192
194 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) { 193 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
195 194
......
...@@ -167,7 +167,7 @@ public class TELinkDescriptorsTLV implements PcepValueType { ...@@ -167,7 +167,7 @@ public class TELinkDescriptorsTLV implements PcepValueType {
167 } 167 }
168 168
169 hLength = (short) (c.writerIndex() - tlvStartIndex); 169 hLength = (short) (c.writerIndex() - tlvStartIndex);
170 - c.setShort(tlvLenIndex, hLength); 170 + c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
171 171
172 return c.writerIndex() - tlvStartIndex; 172 return c.writerIndex() - tlvStartIndex;
173 } 173 }
...@@ -185,7 +185,7 @@ public class TELinkDescriptorsTLV implements PcepValueType { ...@@ -185,7 +185,7 @@ public class TELinkDescriptorsTLV implements PcepValueType {
185 // Node Descriptor Sub-TLVs (variable) 185 // Node Descriptor Sub-TLVs (variable)
186 LinkedList<PcepValueType> llLinkDescriptorsSubTLVs = new LinkedList<PcepValueType>(); 186 LinkedList<PcepValueType> llLinkDescriptorsSubTLVs = new LinkedList<PcepValueType>();
187 187
188 - ChannelBuffer tempCb = c.readBytes(length - TLV_HEADER_LENGTH); 188 + ChannelBuffer tempCb = c.readBytes(length);
189 189
190 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) { 190 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
191 191
......
...@@ -167,7 +167,7 @@ public class TENodeAttributesTlv implements PcepValueType { ...@@ -167,7 +167,7 @@ public class TENodeAttributesTlv implements PcepValueType {
167 } 167 }
168 168
169 hLength = (short) (c.writerIndex() - tlvStartIndex); 169 hLength = (short) (c.writerIndex() - tlvStartIndex);
170 - c.setShort(tlvLenIndex, hLength); 170 + c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
171 171
172 return c.writerIndex() - tlvStartIndex; 172 return c.writerIndex() - tlvStartIndex;
173 } 173 }
...@@ -185,7 +185,7 @@ public class TENodeAttributesTlv implements PcepValueType { ...@@ -185,7 +185,7 @@ public class TENodeAttributesTlv implements PcepValueType {
185 // Node Descriptor Sub-TLVs (variable) 185 // Node Descriptor Sub-TLVs (variable)
186 LinkedList<PcepValueType> llNodeAttributesSubTLVs = new LinkedList<PcepValueType>(); 186 LinkedList<PcepValueType> llNodeAttributesSubTLVs = new LinkedList<PcepValueType>();
187 187
188 - ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH); 188 + ChannelBuffer tempCb = c.readBytes(hLength);
189 189
190 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) { 190 while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
191 PcepValueType tlv; 191 PcepValueType tlv;
......
...@@ -17,19 +17,17 @@ package org.onosproject.pcepio; ...@@ -17,19 +17,17 @@ package org.onosproject.pcepio;
17 17
18 import org.jboss.netty.buffer.ChannelBuffer; 18 import org.jboss.netty.buffer.ChannelBuffer;
19 import org.jboss.netty.buffer.ChannelBuffers; 19 import org.jboss.netty.buffer.ChannelBuffers;
20 -import org.junit.Assert;
21 import org.junit.Test; 20 import org.junit.Test;
22 import org.onosproject.pcepio.exceptions.PcepParseException; 21 import org.onosproject.pcepio.exceptions.PcepParseException;
23 import org.onosproject.pcepio.protocol.PcepFactories; 22 import org.onosproject.pcepio.protocol.PcepFactories;
24 import org.onosproject.pcepio.protocol.PcepInitiateMsg; 23 import org.onosproject.pcepio.protocol.PcepInitiateMsg;
25 import org.onosproject.pcepio.protocol.PcepMessage; 24 import org.onosproject.pcepio.protocol.PcepMessage;
26 import org.onosproject.pcepio.protocol.PcepMessageReader; 25 import org.onosproject.pcepio.protocol.PcepMessageReader;
27 -
28 import static org.hamcrest.MatcherAssert.assertThat; 26 import static org.hamcrest.MatcherAssert.assertThat;
29 import static org.hamcrest.core.Is.is; 27 import static org.hamcrest.core.Is.is;
30 -import static org.hamcrest.core.IsSame.sameInstance; 28 +import static org.hamcrest.Matchers.instanceOf;
31 29
32 -public class PcepInitiateMsgTest2 { 30 +public class PcepInitiateMsgExtTest {
33 31
34 /** 32 /**
35 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, 33 * This test case checks for SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv,
...@@ -54,11 +52,12 @@ public class PcepInitiateMsgTest2 { ...@@ -54,11 +52,12 @@ public class PcepInitiateMsgTest2 {
54 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 52 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
55 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv 53 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv
56 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 54 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
57 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 55 + 0x07, 0x10, 0x00, 0x14, //ERO object
58 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 56 + 0x01, 0x08, 0x0C, 0x01, 0x01, 0x01, 0x00, 0x00,
57 + 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
59 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 58 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
60 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 59 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
61 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, //Bandwidth object 60 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object
62 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, //Metric object 61 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, //Metric object
63 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x20}; //Metric object 62 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x20}; //Metric object
64 63
...@@ -69,10 +68,9 @@ public class PcepInitiateMsgTest2 { ...@@ -69,10 +68,9 @@ public class PcepInitiateMsgTest2 {
69 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 68 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
70 PcepMessage message = null; 69 PcepMessage message = null;
71 70
72 -
73 message = reader.readFrom(buffer); 71 message = reader.readFrom(buffer);
74 72
75 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 73 + assertThat(message, instanceOf(PcepInitiateMsg.class));
76 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 74 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
77 75
78 message.writeTo(buf); 76 message.writeTo(buf);
...@@ -98,10 +96,10 @@ public class PcepInitiateMsgTest2 { ...@@ -98,10 +96,10 @@ public class PcepInitiateMsgTest2 {
98 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, StatefulLspDbVerTlv, 96 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv, SymbolicPathNameTlv, StatefulLspDbVerTlv,
99 * StatefulLspErrorCodeTlv, StatefulRsvpErrorSpecTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT. 97 * StatefulLspErrorCodeTlv, StatefulRsvpErrorSpecTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT.
100 */ 98 */
101 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x98, 99 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0xA8,
102 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 100 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
103 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 101 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
104 - 0x20, 0x10, 0x00, 0x38, 0x00, 0x00, 0x10, 0x03, //LSP object 102 + 0x20, 0x10, 0x00, 0x48, 0x00, 0x00, 0x10, 0x03, //LSP object
105 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 103 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
106 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 104 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
107 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 105 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
...@@ -109,14 +107,14 @@ public class PcepInitiateMsgTest2 { ...@@ -109,14 +107,14 @@ public class PcepInitiateMsgTest2 {
109 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv 107 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv
110 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 108 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
111 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv 109 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv
112 - // 0x00, 0x15, 0x00, 0x0c, //StatefulRsvpErrorSpecTlv 110 + 0x00, 0x15, 0x00, 0x0c, //StatefulRsvpErrorSpecTlv
113 - // 0x00, 0x0c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05, 111 + 0x00, 0x0c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05,
114 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 112 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
115 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 113 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
116 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 114 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
117 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 115 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
118 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 116 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
119 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 117 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
120 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01}; 118 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01};
121 119
122 byte[] testInitiateCreationMsg = {0}; 120 byte[] testInitiateCreationMsg = {0};
...@@ -126,10 +124,9 @@ public class PcepInitiateMsgTest2 { ...@@ -126,10 +124,9 @@ public class PcepInitiateMsgTest2 {
126 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 124 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
127 PcepMessage message = null; 125 PcepMessage message = null;
128 126
129 -
130 message = reader.readFrom(buffer); 127 message = reader.readFrom(buffer);
131 128
132 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 129 + assertThat(message, instanceOf(PcepInitiateMsg.class));
133 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 130 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
134 131
135 message.writeTo(buf); 132 message.writeTo(buf);
...@@ -168,11 +165,11 @@ public class PcepInitiateMsgTest2 { ...@@ -168,11 +165,11 @@ public class PcepInitiateMsgTest2 {
168 // 0x00, 0x15, 0x00, 0x0c, //StatefulRsvpErrorSpecTlv 165 // 0x00, 0x15, 0x00, 0x0c, //StatefulRsvpErrorSpecTlv
169 //0x00, 0x0c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05, 166 //0x00, 0x0c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05,
170 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 167 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
171 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 168 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
172 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 169 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
173 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 170 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
174 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 171 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
175 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}; 172 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
176 173
177 byte[] testInitiateCreationMsg = {0}; 174 byte[] testInitiateCreationMsg = {0};
178 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 175 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -181,10 +178,9 @@ public class PcepInitiateMsgTest2 { ...@@ -181,10 +178,9 @@ public class PcepInitiateMsgTest2 {
181 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 178 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
182 PcepMessage message = null; 179 PcepMessage message = null;
183 180
184 -
185 message = reader.readFrom(buffer); 181 message = reader.readFrom(buffer);
186 182
187 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 183 + assertThat(message, instanceOf(PcepInitiateMsg.class));
188 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 184 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
189 185
190 message.writeTo(buf); 186 message.writeTo(buf);
...@@ -223,8 +219,8 @@ public class PcepInitiateMsgTest2 { ...@@ -223,8 +219,8 @@ public class PcepInitiateMsgTest2 {
223 // 0x00, 0x15, 0x00, 0x0c, //StatefulRsvpErrorSpecTlv 219 // 0x00, 0x15, 0x00, 0x0c, //StatefulRsvpErrorSpecTlv
224 // 0x00, 0x0c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05, 220 // 0x00, 0x0c, 0x06, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x05,
225 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 221 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
226 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 222 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
227 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 223 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
228 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 224 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
229 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 225 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
230 226
...@@ -235,10 +231,9 @@ public class PcepInitiateMsgTest2 { ...@@ -235,10 +231,9 @@ public class PcepInitiateMsgTest2 {
235 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 231 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
236 PcepMessage message = null; 232 PcepMessage message = null;
237 233
238 -
239 message = reader.readFrom(buffer); 234 message = reader.readFrom(buffer);
240 235
241 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 236 + assertThat(message, instanceOf(PcepInitiateMsg.class));
242 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 237 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
243 238
244 message.writeTo(buf); 239 message.writeTo(buf);
...@@ -275,8 +270,8 @@ public class PcepInitiateMsgTest2 { ...@@ -275,8 +270,8 @@ public class PcepInitiateMsgTest2 {
275 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 270 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
276 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv 271 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv
277 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 272 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
278 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 273 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
279 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 274 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
280 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 275 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
281 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 276 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
282 277
...@@ -287,11 +282,9 @@ public class PcepInitiateMsgTest2 { ...@@ -287,11 +282,9 @@ public class PcepInitiateMsgTest2 {
287 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 282 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
288 PcepMessage message = null; 283 PcepMessage message = null;
289 284
290 -
291 message = reader.readFrom(buffer); 285 message = reader.readFrom(buffer);
292 286
293 - Assert.assertTrue("PcepMessage is not instance of PcInitiate", 287 + assertThat(message, instanceOf(PcepInitiateMsg.class));
294 - (message instanceof PcepInitiateMsg));
295 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 288 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
296 289
297 message.writeTo(buf); 290 message.writeTo(buf);
...@@ -328,11 +321,11 @@ public class PcepInitiateMsgTest2 { ...@@ -328,11 +321,11 @@ public class PcepInitiateMsgTest2 {
328 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 321 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
329 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv 322 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv
330 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 323 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
331 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 324 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
332 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 325 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
333 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 326 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
334 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 327 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
335 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}; 328 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
336 329
337 byte[] testInitiateCreationMsg = {0}; 330 byte[] testInitiateCreationMsg = {0};
338 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 331 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -341,10 +334,9 @@ public class PcepInitiateMsgTest2 { ...@@ -341,10 +334,9 @@ public class PcepInitiateMsgTest2 {
341 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 334 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
342 PcepMessage message = null; 335 PcepMessage message = null;
343 336
344 -
345 message = reader.readFrom(buffer); 337 message = reader.readFrom(buffer);
346 338
347 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 339 + assertThat(message, instanceOf(PcepInitiateMsg.class));
348 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 340 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
349 341
350 message.writeTo(buf); 342 message.writeTo(buf);
...@@ -381,11 +373,11 @@ public class PcepInitiateMsgTest2 { ...@@ -381,11 +373,11 @@ public class PcepInitiateMsgTest2 {
381 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 373 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
382 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv 374 0x00, 0x14, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, //StatefulLspErrorCodeTlv
383 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 375 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
384 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 376 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
385 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 377 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
386 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 378 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
387 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 379 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
388 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 380 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
389 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01}; 381 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01};
390 382
391 byte[] testInitiateCreationMsg = {0}; 383 byte[] testInitiateCreationMsg = {0};
...@@ -395,10 +387,9 @@ public class PcepInitiateMsgTest2 { ...@@ -395,10 +387,9 @@ public class PcepInitiateMsgTest2 {
395 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 387 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
396 PcepMessage message = null; 388 PcepMessage message = null;
397 389
398 -
399 message = reader.readFrom(buffer); 390 message = reader.readFrom(buffer);
400 391
401 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 392 + assertThat(message, instanceOf(PcepInitiateMsg.class));
402 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 393 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
403 394
404 message.writeTo(buf); 395 message.writeTo(buf);
...@@ -434,11 +425,11 @@ public class PcepInitiateMsgTest2 { ...@@ -434,11 +425,11 @@ public class PcepInitiateMsgTest2 {
434 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv 425 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv
435 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 426 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
436 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 427 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
437 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 428 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
438 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 429 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
439 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 430 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
440 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 431 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
441 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 432 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
442 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01}; 433 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01};
443 434
444 byte[] testInitiateCreationMsg = {0}; 435 byte[] testInitiateCreationMsg = {0};
...@@ -448,10 +439,9 @@ public class PcepInitiateMsgTest2 { ...@@ -448,10 +439,9 @@ public class PcepInitiateMsgTest2 {
448 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 439 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
449 PcepMessage message = null; 440 PcepMessage message = null;
450 441
451 -
452 message = reader.readFrom(buffer); 442 message = reader.readFrom(buffer);
453 443
454 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 444 + assertThat(message, instanceOf(PcepInitiateMsg.class));
455 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 445 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
456 446
457 message.writeTo(buf); 447 message.writeTo(buf);
...@@ -487,8 +477,8 @@ public class PcepInitiateMsgTest2 { ...@@ -487,8 +477,8 @@ public class PcepInitiateMsgTest2 {
487 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv 477 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv
488 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 478 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
489 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 479 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
490 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 480 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
491 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 481 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
492 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 482 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
493 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 483 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
494 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object 484 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object
...@@ -500,10 +490,9 @@ public class PcepInitiateMsgTest2 { ...@@ -500,10 +490,9 @@ public class PcepInitiateMsgTest2 {
500 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 490 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
501 PcepMessage message = null; 491 PcepMessage message = null;
502 492
503 -
504 message = reader.readFrom(buffer); 493 message = reader.readFrom(buffer);
505 494
506 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 495 + assertThat(message, instanceOf(PcepInitiateMsg.class));
507 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 496 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
508 497
509 message.writeTo(buf); 498 message.writeTo(buf);
...@@ -536,8 +525,8 @@ public class PcepInitiateMsgTest2 { ...@@ -536,8 +525,8 @@ public class PcepInitiateMsgTest2 {
536 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 525 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
537 0x00, 0x11, 0x00, 0x04, 0x54, 0x31, 0x32, 0x33, //SymbolicPathNameTlv 526 0x00, 0x11, 0x00, 0x04, 0x54, 0x31, 0x32, 0x33, //SymbolicPathNameTlv
538 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 527 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
539 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 528 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
540 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 529 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
541 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 530 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
542 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 531 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
543 532
...@@ -548,10 +537,9 @@ public class PcepInitiateMsgTest2 { ...@@ -548,10 +537,9 @@ public class PcepInitiateMsgTest2 {
548 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 537 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
549 PcepMessage message = null; 538 PcepMessage message = null;
550 539
551 -
552 message = reader.readFrom(buffer); 540 message = reader.readFrom(buffer);
553 541
554 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 542 + assertThat(message, instanceOf(PcepInitiateMsg.class));
555 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 543 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
556 544
557 message.writeTo(buf); 545 message.writeTo(buf);
...@@ -587,8 +575,8 @@ public class PcepInitiateMsgTest2 { ...@@ -587,8 +575,8 @@ public class PcepInitiateMsgTest2 {
587 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv 575 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv
588 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 576 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
589 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 577 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
590 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 578 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
591 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 579 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
592 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 580 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
593 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 581 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
594 582
...@@ -599,10 +587,9 @@ public class PcepInitiateMsgTest2 { ...@@ -599,10 +587,9 @@ public class PcepInitiateMsgTest2 {
599 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 587 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
600 PcepMessage message = null; 588 PcepMessage message = null;
601 589
602 -
603 message = reader.readFrom(buffer); 590 message = reader.readFrom(buffer);
604 591
605 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 592 + assertThat(message, instanceOf(PcepInitiateMsg.class));
606 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 593 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
607 594
608 message.writeTo(buf); 595 message.writeTo(buf);
...@@ -634,8 +621,8 @@ public class PcepInitiateMsgTest2 { ...@@ -634,8 +621,8 @@ public class PcepInitiateMsgTest2 {
634 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 621 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
635 0x00, 0x11, 0x00, 0x04, 0x54, 0x31, 0x32, 0x33, //SymbolicPathNameTlv 622 0x00, 0x11, 0x00, 0x04, 0x54, 0x31, 0x32, 0x33, //SymbolicPathNameTlv
636 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 623 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
637 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 624 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
638 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 625 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
639 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 626 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
640 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 627 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
641 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object 628 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object
...@@ -647,10 +634,9 @@ public class PcepInitiateMsgTest2 { ...@@ -647,10 +634,9 @@ public class PcepInitiateMsgTest2 {
647 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 634 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
648 PcepMessage message = null; 635 PcepMessage message = null;
649 636
650 -
651 message = reader.readFrom(buffer); 637 message = reader.readFrom(buffer);
652 638
653 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 639 + assertThat(message, instanceOf(PcepInitiateMsg.class));
654 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 640 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
655 641
656 message.writeTo(buf); 642 message.writeTo(buf);
...@@ -684,8 +670,8 @@ public class PcepInitiateMsgTest2 { ...@@ -684,8 +670,8 @@ public class PcepInitiateMsgTest2 {
684 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 670 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
685 0x00, 0x11, 0x00, 0x04, 0x54, 0x31, 0x32, 0x33, //SymbolicPathNameTlv 671 0x00, 0x11, 0x00, 0x04, 0x54, 0x31, 0x32, 0x33, //SymbolicPathNameTlv
686 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 672 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
687 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 673 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
688 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 674 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
689 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 675 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
690 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 676 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
691 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object 677 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object
...@@ -698,10 +684,9 @@ public class PcepInitiateMsgTest2 { ...@@ -698,10 +684,9 @@ public class PcepInitiateMsgTest2 {
698 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 684 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
699 PcepMessage message = null; 685 PcepMessage message = null;
700 686
701 -
702 message = reader.readFrom(buffer); 687 message = reader.readFrom(buffer);
703 688
704 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 689 + assertThat(message, instanceOf(PcepInitiateMsg.class));
705 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 690 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
706 691
707 message.writeTo(buf); 692 message.writeTo(buf);
...@@ -733,8 +718,8 @@ public class PcepInitiateMsgTest2 { ...@@ -733,8 +718,8 @@ public class PcepInitiateMsgTest2 {
733 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 718 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
734 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 719 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
735 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 720 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
736 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 721 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
737 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 722 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
738 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 723 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
739 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 724 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
740 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object 725 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object
...@@ -747,10 +732,9 @@ public class PcepInitiateMsgTest2 { ...@@ -747,10 +732,9 @@ public class PcepInitiateMsgTest2 {
747 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 732 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
748 PcepMessage message = null; 733 PcepMessage message = null;
749 734
750 -
751 message = reader.readFrom(buffer); 735 message = reader.readFrom(buffer);
752 736
753 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 737 + assertThat(message, instanceOf(PcepInitiateMsg.class));
754 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 738 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
755 739
756 message.writeTo(buf); 740 message.writeTo(buf);
...@@ -782,8 +766,8 @@ public class PcepInitiateMsgTest2 { ...@@ -782,8 +766,8 @@ public class PcepInitiateMsgTest2 {
782 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 766 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
783 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 767 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
784 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 768 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
785 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 769 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
786 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 770 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
787 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 771 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
788 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 772 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
789 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object 773 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object
...@@ -795,10 +779,9 @@ public class PcepInitiateMsgTest2 { ...@@ -795,10 +779,9 @@ public class PcepInitiateMsgTest2 {
795 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 779 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
796 PcepMessage message = null; 780 PcepMessage message = null;
797 781
798 -
799 message = reader.readFrom(buffer); 782 message = reader.readFrom(buffer);
800 783
801 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 784 + assertThat(message, instanceOf(PcepInitiateMsg.class));
802 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 785 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
803 786
804 message.writeTo(buf); 787 message.writeTo(buf);
...@@ -830,8 +813,8 @@ public class PcepInitiateMsgTest2 { ...@@ -830,8 +813,8 @@ public class PcepInitiateMsgTest2 {
830 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 813 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
831 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 814 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
832 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 815 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
833 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 816 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
834 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 817 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
835 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 818 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
836 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 819 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
837 820
...@@ -842,10 +825,9 @@ public class PcepInitiateMsgTest2 { ...@@ -842,10 +825,9 @@ public class PcepInitiateMsgTest2 {
842 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 825 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
843 PcepMessage message = null; 826 PcepMessage message = null;
844 827
845 -
846 message = reader.readFrom(buffer); 828 message = reader.readFrom(buffer);
847 829
848 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 830 + assertThat(message, instanceOf(PcepInitiateMsg.class));
849 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 831 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
850 832
851 message.writeTo(buf); 833 message.writeTo(buf);
...@@ -868,15 +850,15 @@ public class PcepInitiateMsgTest2 { ...@@ -868,15 +850,15 @@ public class PcepInitiateMsgTest2 {
868 850
869 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA OBJECT. 851 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA OBJECT.
870 */ 852 */
871 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x5c, 853 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x60,
872 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 854 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
873 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 855 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
874 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 856 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
875 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 857 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
876 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 858 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
877 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 859 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
878 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 860 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
879 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 861 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
880 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 862 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
881 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 863 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
882 864
...@@ -887,10 +869,9 @@ public class PcepInitiateMsgTest2 { ...@@ -887,10 +869,9 @@ public class PcepInitiateMsgTest2 {
887 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 869 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
888 PcepMessage message = null; 870 PcepMessage message = null;
889 871
890 -
891 message = reader.readFrom(buffer); 872 message = reader.readFrom(buffer);
892 873
893 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 874 + assertThat(message, instanceOf(PcepInitiateMsg.class));
894 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 875 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
895 876
896 message.writeTo(buf); 877 message.writeTo(buf);
...@@ -913,15 +894,15 @@ public class PcepInitiateMsgTest2 { ...@@ -913,15 +894,15 @@ public class PcepInitiateMsgTest2 {
913 894
914 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH OBJECT. 895 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH OBJECT.
915 */ 896 */
916 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x64, 897 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x68,
917 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 898 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
918 - 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, (byte) 0x83, 899 + 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03,
919 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 900 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
920 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 901 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
921 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 902 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
922 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 903 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
923 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 904 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
924 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 905 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
925 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 906 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
926 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 907 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
927 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object 908 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object
...@@ -936,7 +917,7 @@ public class PcepInitiateMsgTest2 { ...@@ -936,7 +917,7 @@ public class PcepInitiateMsgTest2 {
936 917
937 message = reader.readFrom(buffer); 918 message = reader.readFrom(buffer);
938 919
939 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 920 + assertThat(message, instanceOf(PcepInitiateMsg.class));
940 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 921 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
941 922
942 message.writeTo(buf); 923 message.writeTo(buf);
...@@ -959,15 +940,15 @@ public class PcepInitiateMsgTest2 { ...@@ -959,15 +940,15 @@ public class PcepInitiateMsgTest2 {
959 940
960 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT. 941 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT.
961 */ 942 */
962 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x70, 943 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x74,
963 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 944 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
964 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 945 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
965 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 946 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
966 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01, 947 (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x00, 0x01, (byte) 0x80, 0x01,
967 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20, 948 (byte) 0xb6, 0x02, 0x4e, 0x1f, (byte) 0xb6, 0x02, 0x4e, 0x20,
968 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 949 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
969 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 950 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
970 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 951 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
971 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 952 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
972 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 953 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
973 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object 954 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object
...@@ -980,10 +961,9 @@ public class PcepInitiateMsgTest2 { ...@@ -980,10 +961,9 @@ public class PcepInitiateMsgTest2 {
980 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 961 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
981 PcepMessage message = null; 962 PcepMessage message = null;
982 963
983 -
984 message = reader.readFrom(buffer); 964 message = reader.readFrom(buffer);
985 965
986 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 966 + assertThat(message, instanceOf(PcepInitiateMsg.class));
987 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 967 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
988 968
989 message.writeTo(buf); 969 message.writeTo(buf);
...@@ -1006,7 +986,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1006,7 +986,7 @@ public class PcepInitiateMsgTest2 {
1006 986
1007 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT. 987 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT.
1008 */ 988 */
1009 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x60, 989 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x64,
1010 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 990 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1011 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 991 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
1012 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 992 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
...@@ -1026,10 +1006,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1026,10 +1006,9 @@ public class PcepInitiateMsgTest2 {
1026 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1006 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1027 PcepMessage message = null; 1007 PcepMessage message = null;
1028 1008
1029 -
1030 message = reader.readFrom(buffer); 1009 message = reader.readFrom(buffer);
1031 1010
1032 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1011 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1033 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1012 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1034 1013
1035 message.writeTo(buf); 1014 message.writeTo(buf);
...@@ -1052,7 +1031,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1052,7 +1031,7 @@ public class PcepInitiateMsgTest2 {
1052 1031
1053 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH OBJECT. 1032 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA, BANDWIDTH OBJECT.
1054 */ 1033 */
1055 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x54, 1034 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x58,
1056 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1035 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1057 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 1036 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
1058 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 1037 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
...@@ -1071,10 +1050,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1071,10 +1050,9 @@ public class PcepInitiateMsgTest2 {
1071 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1050 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1072 PcepMessage message = null; 1051 PcepMessage message = null;
1073 1052
1074 -
1075 message = reader.readFrom(buffer); 1053 message = reader.readFrom(buffer);
1076 1054
1077 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1055 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1078 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1056 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1079 1057
1080 message.writeTo(buf); 1058 message.writeTo(buf);
...@@ -1097,7 +1075,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1097,7 +1075,7 @@ public class PcepInitiateMsgTest2 {
1097 1075
1098 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA OBJECT. 1076 /* SRP, LSP (StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA OBJECT.
1099 */ 1077 */
1100 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x4c, 1078 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x50,
1101 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1079 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1102 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 1080 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
1103 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv 1081 0x00, 0x12, 0x00, 0x10, //StatefulIPv4LspIdentidiersTlv
...@@ -1115,10 +1093,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1115,10 +1093,9 @@ public class PcepInitiateMsgTest2 {
1115 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1093 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1116 PcepMessage message = null; 1094 PcepMessage message = null;
1117 1095
1118 -
1119 message = reader.readFrom(buffer); 1096 message = reader.readFrom(buffer);
1120 1097
1121 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1098 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1122 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1099 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1123 1100
1124 message.writeTo(buf); 1101 message.writeTo(buf);
...@@ -1141,7 +1118,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1141,7 +1118,7 @@ public class PcepInitiateMsgTest2 {
1141 1118
1142 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA OBJECT. 1119 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA OBJECT.
1143 */ 1120 */
1144 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x54, 1121 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x58,
1145 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1122 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1146 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1123 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1147 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 1124 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
...@@ -1160,10 +1137,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1160,10 +1137,9 @@ public class PcepInitiateMsgTest2 {
1160 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1137 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1161 PcepMessage message = null; 1138 PcepMessage message = null;
1162 1139
1163 -
1164 message = reader.readFrom(buffer); 1140 message = reader.readFrom(buffer);
1165 1141
1166 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1142 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1167 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1143 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1168 1144
1169 message.writeTo(buf); 1145 message.writeTo(buf);
...@@ -1186,7 +1162,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1186,7 +1162,7 @@ public class PcepInitiateMsgTest2 {
1186 1162
1187 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA BANDWIDTH OBJECT. 1163 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), END-POINTS, ERO, LSPA BANDWIDTH OBJECT.
1188 */ 1164 */
1189 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x5c, 1165 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x60,
1190 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1166 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1191 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1167 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1192 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 1168 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
...@@ -1206,10 +1182,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1206,10 +1182,9 @@ public class PcepInitiateMsgTest2 {
1206 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1182 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1207 PcepMessage message = null; 1183 PcepMessage message = null;
1208 1184
1209 -
1210 message = reader.readFrom(buffer); 1185 message = reader.readFrom(buffer);
1211 1186
1212 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1187 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1213 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1188 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1214 1189
1215 message.writeTo(buf); 1190 message.writeTo(buf);
...@@ -1233,7 +1208,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1233,7 +1208,7 @@ public class PcepInitiateMsgTest2 {
1233 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), END-POINTS, 1208 /* SRP, LSP (SymbolicPathNameTlv, StatefulIPv4LspIdentidiersTlv), END-POINTS,
1234 * ERO, LSPA, BANDWIDTH, METRIC OBJECT. 1209 * ERO, LSPA, BANDWIDTH, METRIC OBJECT.
1235 */ 1210 */
1236 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x68, 1211 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x6C,
1237 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1212 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1238 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1213 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1239 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object 1214 0x20, 0x10, 0x00, 0x1c, 0x00, 0x00, 0x10, 0x03, //LSP object
...@@ -1254,10 +1229,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1254,10 +1229,9 @@ public class PcepInitiateMsgTest2 {
1254 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1229 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1255 PcepMessage message = null; 1230 PcepMessage message = null;
1256 1231
1257 -
1258 message = reader.readFrom(buffer); 1232 message = reader.readFrom(buffer);
1259 1233
1260 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1234 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1261 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1235 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1262 1236
1263 message.writeTo(buf); 1237 message.writeTo(buf);
...@@ -1280,7 +1254,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1280,7 +1254,7 @@ public class PcepInitiateMsgTest2 {
1280 1254
1281 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT. 1255 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA, BANDWIDTH, METRIC OBJECT.
1282 */ 1256 */
1283 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x54, 1257 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x60,
1284 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1258 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1285 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1259 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1286 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object 1260 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
...@@ -1299,10 +1273,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1299,10 +1273,9 @@ public class PcepInitiateMsgTest2 {
1299 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1273 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1300 PcepMessage message = null; 1274 PcepMessage message = null;
1301 1275
1302 -
1303 message = reader.readFrom(buffer); 1276 message = reader.readFrom(buffer);
1304 1277
1305 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1278 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1306 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1279 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1307 1280
1308 message.writeTo(buf); 1281 message.writeTo(buf);
...@@ -1325,7 +1298,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1325,7 +1298,7 @@ public class PcepInitiateMsgTest2 {
1325 1298
1326 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA, BANDWIDTH OBJECT. 1299 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA, BANDWIDTH OBJECT.
1327 */ 1300 */
1328 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x48, 1301 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x54,
1329 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1302 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1330 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1303 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1331 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object 1304 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
...@@ -1334,7 +1307,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1334,7 +1307,7 @@ public class PcepInitiateMsgTest2 {
1334 0x07, 0x10, 0x00, 0x04, //ERO object 1307 0x07, 0x10, 0x00, 0x04, //ERO object
1335 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 1308 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
1336 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 1309 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
1337 - 0x05, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object 1310 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object
1338 1311
1339 byte[] testInitiateCreationMsg = {0}; 1312 byte[] testInitiateCreationMsg = {0};
1340 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 1313 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -1343,10 +1316,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1343,10 +1316,9 @@ public class PcepInitiateMsgTest2 {
1343 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1316 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1344 PcepMessage message = null; 1317 PcepMessage message = null;
1345 1318
1346 -
1347 message = reader.readFrom(buffer); 1319 message = reader.readFrom(buffer);
1348 1320
1349 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1321 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1350 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1322 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1351 1323
1352 message.writeTo(buf); 1324 message.writeTo(buf);
...@@ -1369,7 +1341,7 @@ public class PcepInitiateMsgTest2 { ...@@ -1369,7 +1341,7 @@ public class PcepInitiateMsgTest2 {
1369 1341
1370 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA OBJECT. 1342 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA OBJECT.
1371 */ 1343 */
1372 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x40, 1344 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x4C,
1373 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1345 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1374 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1346 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1375 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object 1347 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
...@@ -1386,10 +1358,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1386,10 +1358,9 @@ public class PcepInitiateMsgTest2 {
1386 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1358 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1387 PcepMessage message = null; 1359 PcepMessage message = null;
1388 1360
1389 -
1390 message = reader.readFrom(buffer); 1361 message = reader.readFrom(buffer);
1391 1362
1392 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1363 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1393 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1364 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1394 1365
1395 message.writeTo(buf); 1366 message.writeTo(buf);
...@@ -1412,14 +1383,14 @@ public class PcepInitiateMsgTest2 { ...@@ -1412,14 +1383,14 @@ public class PcepInitiateMsgTest2 {
1412 1383
1413 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA OBJECT. 1384 /* SRP, LSP (SymbolicPathNameTlv, SymbolicPathNameTlv), END-POINTS, ERO, LSPA OBJECT.
1414 */ 1385 */
1415 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x50, 1386 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x5C,
1416 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1387 0x21, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1417 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1388 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1418 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object 1389 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
1419 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1390 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1420 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 1391 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
1421 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 1392 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
1422 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 1393 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
1423 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 1394 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
1424 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 1395 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
1425 1396
...@@ -1430,10 +1401,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1430,10 +1401,9 @@ public class PcepInitiateMsgTest2 {
1430 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1401 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1431 PcepMessage message = null; 1402 PcepMessage message = null;
1432 1403
1433 -
1434 message = reader.readFrom(buffer); 1404 message = reader.readFrom(buffer);
1435 1405
1436 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1406 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1437 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1407 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1438 1408
1439 message.writeTo(buf); 1409 message.writeTo(buf);
...@@ -1456,13 +1426,13 @@ public class PcepInitiateMsgTest2 { ...@@ -1456,13 +1426,13 @@ public class PcepInitiateMsgTest2 {
1456 1426
1457 /* SRP, LSP (SymbolicPathNameTlv), END-POINTS, ERO, LSPA OBJECT. 1427 /* SRP, LSP (SymbolicPathNameTlv), END-POINTS, ERO, LSPA OBJECT.
1458 */ 1428 */
1459 - byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x48, 1429 + byte[] initiateCreationMsg = new byte[]{0x20, 0x0C, 0x00, (byte) 0x54,
1460 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object 1430 0x21, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, //SRP object
1461 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object 1431 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
1462 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv 1432 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //SymbolicPathNameTlv
1463 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 1433 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
1464 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 1434 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
1465 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 1435 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
1466 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 1436 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
1467 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 1437 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
1468 1438
...@@ -1473,10 +1443,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1473,10 +1443,9 @@ public class PcepInitiateMsgTest2 {
1473 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1443 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1474 PcepMessage message = null; 1444 PcepMessage message = null;
1475 1445
1476 -
1477 message = reader.readFrom(buffer); 1446 message = reader.readFrom(buffer);
1478 1447
1479 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1448 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1480 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1449 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1481 1450
1482 message.writeTo(buf); 1451 message.writeTo(buf);
...@@ -1520,10 +1489,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1520,10 +1489,9 @@ public class PcepInitiateMsgTest2 {
1520 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1489 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1521 PcepMessage message = null; 1490 PcepMessage message = null;
1522 1491
1523 -
1524 message = reader.readFrom(buffer); 1492 message = reader.readFrom(buffer);
1525 1493
1526 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1494 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1527 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1495 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1528 1496
1529 message.writeTo(buf); 1497 message.writeTo(buf);
...@@ -1566,10 +1534,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1566,10 +1534,9 @@ public class PcepInitiateMsgTest2 {
1566 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1534 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1567 PcepMessage message = null; 1535 PcepMessage message = null;
1568 1536
1569 -
1570 message = reader.readFrom(buffer); 1537 message = reader.readFrom(buffer);
1571 1538
1572 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1539 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1573 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1540 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1574 1541
1575 message.writeTo(buf); 1542 message.writeTo(buf);
...@@ -1611,10 +1578,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1611,10 +1578,9 @@ public class PcepInitiateMsgTest2 {
1611 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1578 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1612 PcepMessage message = null; 1579 PcepMessage message = null;
1613 1580
1614 -
1615 message = reader.readFrom(buffer); 1581 message = reader.readFrom(buffer);
1616 1582
1617 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1583 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1618 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1584 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1619 1585
1620 message.writeTo(buf); 1586 message.writeTo(buf);
...@@ -1645,8 +1611,8 @@ public class PcepInitiateMsgTest2 { ...@@ -1645,8 +1611,8 @@ public class PcepInitiateMsgTest2 {
1645 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv 1611 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv
1646 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 1612 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
1647 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 1613 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
1648 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 1614 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
1649 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 1615 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
1650 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 1616 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
1651 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 1617 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
1652 1618
...@@ -1657,10 +1623,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1657,10 +1623,9 @@ public class PcepInitiateMsgTest2 {
1657 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1623 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1658 PcepMessage message = null; 1624 PcepMessage message = null;
1659 1625
1660 -
1661 message = reader.readFrom(buffer); 1626 message = reader.readFrom(buffer);
1662 1627
1663 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1628 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1664 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1629 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1665 1630
1666 message.writeTo(buf); 1631 message.writeTo(buf);
...@@ -1690,8 +1655,8 @@ public class PcepInitiateMsgTest2 { ...@@ -1690,8 +1655,8 @@ public class PcepInitiateMsgTest2 {
1690 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv 1655 0x00, 0x17, 0x00, 0x08, //StatefulLspDbVerTlv
1691 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 1656 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
1692 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object 1657 0x04, 0x12, 0x00, 0x0C, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, //Endpoints Object
1693 - 0x07, 0x10, 0x00, 0x14, (byte) 0x01, 0x08, 0x0C, 0x01, //ERO object 1658 + 0x07, 0x10, 0x00, 0x14, 0x01, 0x08, 0x0C, 0x01, //ERO object
1694 - 0x01, 0x01, 0x00, 0x00, (byte) 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00, 1659 + 0x01, 0x01, 0x00, 0x00, 0x01, 0x08, 0x0C, 0x01, 0x01, 0x02, 0x00, 0x00,
1695 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 1660 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
1696 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00}; 1661 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00};
1697 1662
...@@ -1702,10 +1667,9 @@ public class PcepInitiateMsgTest2 { ...@@ -1702,10 +1667,9 @@ public class PcepInitiateMsgTest2 {
1702 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader(); 1667 PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
1703 PcepMessage message = null; 1668 PcepMessage message = null;
1704 1669
1705 -
1706 message = reader.readFrom(buffer); 1670 message = reader.readFrom(buffer);
1707 1671
1708 - assertThat(message, sameInstance((PcepInitiateMsg) message)); 1672 + assertThat(message, instanceOf(PcepInitiateMsg.class));
1709 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1673 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1710 1674
1711 message.writeTo(buf); 1675 message.writeTo(buf);
......
...@@ -27,7 +27,7 @@ import org.onosproject.pcepio.protocol.PcepMessage; ...@@ -27,7 +27,7 @@ import org.onosproject.pcepio.protocol.PcepMessage;
27 import org.onosproject.pcepio.protocol.PcepMessageReader; 27 import org.onosproject.pcepio.protocol.PcepMessageReader;
28 import org.onosproject.pcepio.protocol.PcepReportMsg; 28 import org.onosproject.pcepio.protocol.PcepReportMsg;
29 29
30 -public class PcepReportMsgTest2 { 30 +public class PcepReportMsgExtTest {
31 31
32 /** 32 /**
33 * This test case checks forSRP Object,LSP Object(symbolic path tlv),ERO Object 33 * This test case checks forSRP Object,LSP Object(symbolic path tlv),ERO Object
...@@ -39,17 +39,17 @@ public class PcepReportMsgTest2 { ...@@ -39,17 +39,17 @@ public class PcepReportMsgTest2 {
39 39
40 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0x98, 40 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0x98,
41 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 41 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
42 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 42 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
43 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 43 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
44 0x07, 0x10, 0x00, 0x14, //ERO Object 44 0x07, 0x10, 0x00, 0x14, //ERO Object
45 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 45 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
46 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 46 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
47 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 47 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
48 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 48 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
49 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 49 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
50 0x07, 0x10, 0x00, 0x14, //ERO object 50 0x07, 0x10, 0x00, 0x14, //ERO object
51 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 51 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
52 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 52 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
53 0x08, 0x10, 0x00, 0x34, 0x01, 0x08, 0x11, 0x01, //RRO object 53 0x08, 0x10, 0x00, 0x34, 0x01, 0x08, 0x11, 0x01, //RRO object
54 0x01, 0x01, 0x04, 0x00, 0x01, 0x08, 0x11, 0x01, 54 0x01, 0x01, 0x04, 0x00, 0x01, 0x08, 0x11, 0x01,
55 0x01, 0x02, 0x04, 0x00, 0x01, 0x08, 0x06, 0x06, 55 0x01, 0x02, 0x04, 0x00, 0x01, 0x08, 0x06, 0x06,
...@@ -86,17 +86,17 @@ public class PcepReportMsgTest2 { ...@@ -86,17 +86,17 @@ public class PcepReportMsgTest2 {
86 86
87 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0x64, 87 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0x64,
88 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 88 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
89 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 89 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
90 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 90 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
91 0x07, 0x10, 0x00, 0x14, //ERO object 91 0x07, 0x10, 0x00, 0x14, //ERO object
92 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 92 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
93 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 93 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
94 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 94 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
95 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 95 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
96 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 96 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
97 0x07, 0x10, 0x00, 0x14, //ERO object 97 0x07, 0x10, 0x00, 0x14, //ERO object
98 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 98 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
99 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00}; 99 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00};
100 100
101 byte[] testReportMsg = {0}; 101 byte[] testReportMsg = {0};
102 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 102 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -127,19 +127,19 @@ public class PcepReportMsgTest2 { ...@@ -127,19 +127,19 @@ public class PcepReportMsgTest2 {
127 127
128 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0x8c, 128 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0x8c,
129 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 129 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
130 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 130 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
131 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 131 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
132 0x07, 0x10, 0x00, 0x14, //ERO object 132 0x07, 0x10, 0x00, 0x14, //ERO object
133 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 133 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
134 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 134 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
135 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 135 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
136 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 136 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
137 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 137 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
138 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 138 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
139 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 139 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
140 0x07, 0x10, 0x00, 0x14, //ERO object 140 0x07, 0x10, 0x00, 0x14, //ERO object
141 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 141 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
142 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 142 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
143 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, //LSPA object 143 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, //LSPA object
144 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; 144 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
145 145
...@@ -173,21 +173,21 @@ public class PcepReportMsgTest2 { ...@@ -173,21 +173,21 @@ public class PcepReportMsgTest2 {
173 173
174 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0xE8, 174 byte[] reportMsg = new byte[] {0x20, 0x0a, 0x00, (byte) 0xE8,
175 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 175 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
176 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 176 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
177 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 177 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
178 0x07, 0x10, 0x00, 0x14, //ERO object 178 0x07, 0x10, 0x00, 0x14, //ERO object
179 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 179 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
180 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 180 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
181 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 181 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
182 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 182 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
183 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object 183 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object
184 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x20, //Metric object 184 0x06, 0x10, 0x00, 0x0c, 0x00, 0x00, 0x01, 0x03, 0x00, 0x00, 0x00, 0x20, //Metric object
185 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object 185 0x21, 0x10, 0x00, 0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, //SRP object
186 - 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, (byte) 0x83, //LSP object 186 + 0x20, 0x10, 0x00, 0x10, 0x00, 0x00, 0x10, 0x03, //LSP object
187 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv 187 0x00, 0x11, 0x00, 0x02, 0x54, 0x31, 0x00, 0x00, //symbolic path tlv
188 0x07, 0x10, 0x00, 0x14, //ERO object 188 0x07, 0x10, 0x00, 0x14, //ERO object
189 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00, 189 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x1f, 0x04, 0x00,
190 - (byte) 0x81, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00, 190 + 0x01, 0x08, (byte) 0xb6, 0x02, 0x4e, 0x20, 0x04, 0x00,
191 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 191 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
192 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 192 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
193 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object 193 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, //Bandwidth object
......
...@@ -43,7 +43,7 @@ public class PcepTEReportMsgTest { ...@@ -43,7 +43,7 @@ public class PcepTEReportMsgTest {
43 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID 43 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID
44 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 44 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
45 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 45 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
46 - 0x06, 0x65, 0x00, 0x0C, // Local TE Node Descriptors TLV 46 + 0x06, 0x65, 0x00, 0x08, // Local TE Node Descriptors TLV
47 0x00, 0x64, 0x00, 0x04, //AutonomousSystem Tlv 47 0x00, 0x64, 0x00, 0x04, //AutonomousSystem Tlv
48 0x00, 0x00, 0x00, 0x11}; 48 0x00, 0x00, 0x00, 0x11};
49 49
...@@ -81,7 +81,7 @@ public class PcepTEReportMsgTest { ...@@ -81,7 +81,7 @@ public class PcepTEReportMsgTest {
81 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID 81 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID
82 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 82 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
83 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 83 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
84 - 0x06, 0x65, 0x00, 0x0C, // Local TE Node Descriptors TLV 84 + 0x06, 0x65, 0x00, 0x08, // Local TE Node Descriptors TLV
85 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 85 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
86 0x00, 0x00, 0x00, 0x11}; 86 0x00, 0x00, 0x00, 0x11};
87 87
...@@ -153,7 +153,7 @@ public class PcepTEReportMsgTest { ...@@ -153,7 +153,7 @@ public class PcepTEReportMsgTest {
153 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 153 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
154 0x00, 0x00, 0x00, 0x00, 154 0x00, 0x00, 0x00, 0x00,
155 0x00, 0x00, 0x00, 0x01, 155 0x00, 0x00, 0x00, 0x01,
156 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 156 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
157 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 157 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
158 0x00, 0x00, 0x00, 0x11, 158 0x00, 0x00, 0x00, 0x11,
159 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 159 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -199,7 +199,7 @@ public class PcepTEReportMsgTest { ...@@ -199,7 +199,7 @@ public class PcepTEReportMsgTest {
199 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 199 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
200 0x00, 0x00, 0x00, 0x00, 200 0x00, 0x00, 0x00, 0x00,
201 0x00, 0x00, 0x00, 0x01, 201 0x00, 0x00, 0x00, 0x01,
202 - 0x06, 0x65, 0x00, 0x20, // Local TE Node Descriptors TLV 202 + 0x06, 0x65, 0x00, 0x1C, // Local TE Node Descriptors TLV
203 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 203 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
204 0x00, 0x00, 0x00, 0x11, 204 0x00, 0x00, 0x00, 0x11,
205 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv 205 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv
...@@ -242,7 +242,7 @@ public class PcepTEReportMsgTest { ...@@ -242,7 +242,7 @@ public class PcepTEReportMsgTest {
242 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 242 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
243 0x00, 0x00, 0x00, 0x00, 243 0x00, 0x00, 0x00, 0x00,
244 0x00, 0x00, 0x00, 0x01, 244 0x00, 0x00, 0x00, 0x01,
245 - 0x06, 0x65, 0x00, 0x18, // Local TE Node Descriptors TLV 245 + 0x06, 0x65, 0x00, 0x14, // Local TE Node Descriptors TLV
246 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv 246 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv
247 0x00, 0x00, 0x00, 0x11, 247 0x00, 0x00, 0x00, 0x11,
248 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 248 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
...@@ -282,7 +282,7 @@ public class PcepTEReportMsgTest { ...@@ -282,7 +282,7 @@ public class PcepTEReportMsgTest {
282 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 282 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
283 0x00, 0x00, 0x00, 0x00, 283 0x00, 0x00, 0x00, 0x00,
284 0x00, 0x00, 0x00, 0x01, 284 0x00, 0x00, 0x00, 0x01,
285 - 0x06, 0x65, 0x00, 0x10, // Local TE Node Descriptors TLV 285 + 0x06, 0x65, 0x00, 0x0C, // Local TE Node Descriptors TLV
286 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 286 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
287 0x00, 0x00, 0x00, 0x11, 287 0x00, 0x00, 0x00, 0x11,
288 0x00, 0x00, 0x00, 0x11}; 288 0x00, 0x00, 0x00, 0x11};
...@@ -320,7 +320,7 @@ public class PcepTEReportMsgTest { ...@@ -320,7 +320,7 @@ public class PcepTEReportMsgTest {
320 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 320 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
321 0x00, 0x00, 0x00, 0x00, 321 0x00, 0x00, 0x00, 0x00,
322 0x00, 0x00, 0x00, 0x01, 322 0x00, 0x00, 0x00, 0x01,
323 - 0x06, 0x65, 0x00, 0x04 // Local TE Node Descriptors TLV 323 + 0x06, 0x65, 0x00, 0x00 // Local TE Node Descriptors TLV
324 }; 324 };
325 325
326 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 326 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -359,7 +359,7 @@ public class PcepTEReportMsgTest { ...@@ -359,7 +359,7 @@ public class PcepTEReportMsgTest {
359 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 359 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
360 0x00, 0x00, 0x00, 0x00, 360 0x00, 0x00, 0x00, 0x00,
361 0x00, 0x00, 0x00, 0x01, 361 0x00, 0x00, 0x00, 0x01,
362 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 362 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
363 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 363 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
364 0x00, 0x00, 0x00, 0x11, 364 0x00, 0x00, 0x00, 0x11,
365 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 365 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -369,7 +369,7 @@ public class PcepTEReportMsgTest { ...@@ -369,7 +369,7 @@ public class PcepTEReportMsgTest {
369 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 369 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
370 0x00, 0x00, 0x00, 0x11, 370 0x00, 0x00, 0x00, 0x11,
371 0x00, 0x00, 0x00, 0x11, 371 0x00, 0x00, 0x00, 0x11,
372 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 372 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
373 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 373 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
374 0x00, 0x00, 0x00, 0x11, 374 0x00, 0x00, 0x00, 0x11,
375 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 375 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -417,7 +417,7 @@ public class PcepTEReportMsgTest { ...@@ -417,7 +417,7 @@ public class PcepTEReportMsgTest {
417 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 417 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
418 0x00, 0x00, 0x00, 0x00, 418 0x00, 0x00, 0x00, 0x00,
419 0x00, 0x00, 0x00, 0x01, 419 0x00, 0x00, 0x00, 0x01,
420 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 420 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
421 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 421 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
422 0x00, 0x00, 0x00, 0x11, 422 0x00, 0x00, 0x00, 0x11,
423 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 423 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -427,7 +427,7 @@ public class PcepTEReportMsgTest { ...@@ -427,7 +427,7 @@ public class PcepTEReportMsgTest {
427 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 427 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
428 0x00, 0x00, 0x00, 0x11, 428 0x00, 0x00, 0x00, 0x11,
429 0x00, 0x00, 0x00, 0x11, 429 0x00, 0x00, 0x00, 0x11,
430 - 0x03, (byte) 0xEB, 0x00, 0x20, //RemoteTENodeDescriptorsTLV 430 + 0x03, (byte) 0xEB, 0x00, 0x1C, //RemoteTENodeDescriptorsTLV
431 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 431 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
432 0x00, 0x00, 0x00, 0x11, 432 0x00, 0x00, 0x00, 0x11,
433 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv 433 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv
...@@ -472,7 +472,7 @@ public class PcepTEReportMsgTest { ...@@ -472,7 +472,7 @@ public class PcepTEReportMsgTest {
472 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 472 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
473 0x00, 0x00, 0x00, 0x00, 473 0x00, 0x00, 0x00, 0x00,
474 0x00, 0x00, 0x00, 0x01, 474 0x00, 0x00, 0x00, 0x01,
475 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 475 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
476 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 476 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
477 0x00, 0x00, 0x00, 0x11, 477 0x00, 0x00, 0x00, 0x11,
478 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 478 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -482,7 +482,7 @@ public class PcepTEReportMsgTest { ...@@ -482,7 +482,7 @@ public class PcepTEReportMsgTest {
482 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 482 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
483 0x00, 0x00, 0x00, 0x11, 483 0x00, 0x00, 0x00, 0x11,
484 0x00, 0x00, 0x00, 0x11, 484 0x00, 0x00, 0x00, 0x11,
485 - 0x03, (byte) 0xEB, 0x00, 0x18, //RemoteTENodeDescriptorsTLV 485 + 0x03, (byte) 0xEB, 0x00, 0x14, //RemoteTENodeDescriptorsTLV
486 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv 486 0x02, 0x58, 0x00, 0x04, //OSPFareaIDsubTlv
487 0x00, 0x00, 0x00, 0x11, 487 0x00, 0x00, 0x00, 0x11,
488 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 488 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
...@@ -525,7 +525,7 @@ public class PcepTEReportMsgTest { ...@@ -525,7 +525,7 @@ public class PcepTEReportMsgTest {
525 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 525 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
526 0x00, 0x00, 0x00, 0x00, 526 0x00, 0x00, 0x00, 0x00,
527 0x00, 0x00, 0x00, 0x01, 527 0x00, 0x00, 0x00, 0x01,
528 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 528 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
529 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 529 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
530 0x00, 0x00, 0x00, 0x11, 530 0x00, 0x00, 0x00, 0x11,
531 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 531 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -535,7 +535,7 @@ public class PcepTEReportMsgTest { ...@@ -535,7 +535,7 @@ public class PcepTEReportMsgTest {
535 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 535 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
536 0x00, 0x00, 0x00, 0x11, 536 0x00, 0x00, 0x00, 0x11,
537 0x00, 0x00, 0x00, 0x11, 537 0x00, 0x00, 0x00, 0x11,
538 - 0x03, (byte) 0xEB, 0x00, 0x10, //RemoteTENodeDescriptorsTLV 538 + 0x03, (byte) 0xEB, 0x00, 0x0c, //RemoteTENodeDescriptorsTLV
539 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 539 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
540 0x00, 0x00, 0x00, 0x11, 540 0x00, 0x00, 0x00, 0x11,
541 0x00, 0x00, 0x00, 0x11 541 0x00, 0x00, 0x00, 0x11
...@@ -576,7 +576,7 @@ public class PcepTEReportMsgTest { ...@@ -576,7 +576,7 @@ public class PcepTEReportMsgTest {
576 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 576 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
577 0x00, 0x00, 0x00, 0x00, 577 0x00, 0x00, 0x00, 0x00,
578 0x00, 0x00, 0x00, 0x01, 578 0x00, 0x00, 0x00, 0x01,
579 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 579 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
580 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 580 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
581 0x00, 0x00, 0x00, 0x11, 581 0x00, 0x00, 0x00, 0x11,
582 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 582 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -586,7 +586,7 @@ public class PcepTEReportMsgTest { ...@@ -586,7 +586,7 @@ public class PcepTEReportMsgTest {
586 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 586 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
587 0x00, 0x00, 0x00, 0x11, 587 0x00, 0x00, 0x00, 0x11,
588 0x00, 0x00, 0x00, 0x11, 588 0x00, 0x00, 0x00, 0x11,
589 - 0x03, (byte) 0xEB, 0x00, 0x04, //RemoteTENodeDescriptorsTLV 589 + 0x03, (byte) 0xEB, 0x00, 0x00, //RemoteTENodeDescriptorsTLV
590 }; 590 };
591 591
592 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 592 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -626,7 +626,7 @@ public class PcepTEReportMsgTest { ...@@ -626,7 +626,7 @@ public class PcepTEReportMsgTest {
626 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 626 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
627 0x00, 0x00, 0x00, 0x00, 627 0x00, 0x00, 0x00, 0x00,
628 0x00, 0x00, 0x00, 0x01, 628 0x00, 0x00, 0x00, 0x01,
629 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 629 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
630 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 630 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
631 0x00, 0x00, 0x00, 0x11, 631 0x00, 0x00, 0x00, 0x11,
632 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 632 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -636,7 +636,7 @@ public class PcepTEReportMsgTest { ...@@ -636,7 +636,7 @@ public class PcepTEReportMsgTest {
636 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 636 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
637 0x00, 0x00, 0x00, 0x11, 637 0x00, 0x00, 0x00, 0x11,
638 0x00, 0x00, 0x00, 0x11, 638 0x00, 0x00, 0x00, 0x11,
639 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 639 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
640 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 640 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
641 0x00, 0x00, 0x00, 0x11, 641 0x00, 0x00, 0x00, 0x11,
642 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 642 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -646,7 +646,7 @@ public class PcepTEReportMsgTest { ...@@ -646,7 +646,7 @@ public class PcepTEReportMsgTest {
646 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 646 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
647 0x00, 0x00, 0x00, 0x11, 647 0x00, 0x00, 0x00, 0x11,
648 0x00, 0x00, 0x00, 0x11, 648 0x00, 0x00, 0x00, 0x11,
649 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 649 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
650 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 650 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
651 0x01, 0x11, 0x00, 0x09, 651 0x01, 0x11, 0x00, 0x09,
652 0x01, 0x21, 0x00, 0x09, 652 0x01, 0x21, 0x00, 0x09,
...@@ -693,7 +693,7 @@ public class PcepTEReportMsgTest { ...@@ -693,7 +693,7 @@ public class PcepTEReportMsgTest {
693 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 693 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
694 0x00, 0x00, 0x00, 0x00, 694 0x00, 0x00, 0x00, 0x00,
695 0x00, 0x00, 0x00, 0x01, 695 0x00, 0x00, 0x00, 0x01,
696 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 696 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
697 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 697 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
698 0x00, 0x00, 0x00, 0x11, 698 0x00, 0x00, 0x00, 0x11,
699 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 699 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -703,7 +703,7 @@ public class PcepTEReportMsgTest { ...@@ -703,7 +703,7 @@ public class PcepTEReportMsgTest {
703 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 703 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
704 0x00, 0x00, 0x00, 0x11, 704 0x00, 0x00, 0x00, 0x11,
705 0x00, 0x00, 0x00, 0x11, 705 0x00, 0x00, 0x00, 0x11,
706 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 706 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
707 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 707 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
708 0x00, 0x00, 0x00, 0x11, 708 0x00, 0x00, 0x00, 0x11,
709 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 709 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -713,7 +713,7 @@ public class PcepTEReportMsgTest { ...@@ -713,7 +713,7 @@ public class PcepTEReportMsgTest {
713 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 713 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
714 0x00, 0x00, 0x00, 0x11, 714 0x00, 0x00, 0x00, 0x11,
715 0x00, 0x00, 0x00, 0x11, 715 0x00, 0x00, 0x00, 0x11,
716 - 0x04, 0x2E, 0x00, 0x14, //TELinkDescriptorsTLV 716 + 0x04, 0x2E, 0x00, 0x10, //TELinkDescriptorsTLV
717 0x00, 0x06, 0x00, 0x04, //IPv4InterfaceAddressTlv 717 0x00, 0x06, 0x00, 0x04, //IPv4InterfaceAddressTlv
718 0x01, 0x01, 0x01, 0x01, 718 0x01, 0x01, 0x01, 0x01,
719 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 719 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
...@@ -756,7 +756,7 @@ public class PcepTEReportMsgTest { ...@@ -756,7 +756,7 @@ public class PcepTEReportMsgTest {
756 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 756 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
757 0x00, 0x00, 0x00, 0x00, 757 0x00, 0x00, 0x00, 0x00,
758 0x00, 0x00, 0x00, 0x01, 758 0x00, 0x00, 0x00, 0x01,
759 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 759 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
760 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 760 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
761 0x00, 0x00, 0x00, 0x11, 761 0x00, 0x00, 0x00, 0x11,
762 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 762 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -766,7 +766,7 @@ public class PcepTEReportMsgTest { ...@@ -766,7 +766,7 @@ public class PcepTEReportMsgTest {
766 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 766 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
767 0x00, 0x00, 0x00, 0x11, 767 0x00, 0x00, 0x00, 0x11,
768 0x00, 0x00, 0x00, 0x11, 768 0x00, 0x00, 0x00, 0x11,
769 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 769 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
770 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 770 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
771 0x00, 0x00, 0x00, 0x11, 771 0x00, 0x00, 0x00, 0x11,
772 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 772 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -776,7 +776,7 @@ public class PcepTEReportMsgTest { ...@@ -776,7 +776,7 @@ public class PcepTEReportMsgTest {
776 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 776 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
777 0x00, 0x00, 0x00, 0x11, 777 0x00, 0x00, 0x00, 0x11,
778 0x00, 0x00, 0x00, 0x11, 778 0x00, 0x00, 0x00, 0x11,
779 - 0x04, 0x2E, 0x00, 0x0C, //TELinkDescriptorsTLV 779 + 0x04, 0x2E, 0x00, 0x08, //TELinkDescriptorsTLV
780 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 780 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
781 0x01, 0x011, 0x01, 0x10 781 0x01, 0x011, 0x01, 0x10
782 }; 782 };
...@@ -817,7 +817,7 @@ public class PcepTEReportMsgTest { ...@@ -817,7 +817,7 @@ public class PcepTEReportMsgTest {
817 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 817 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
818 0x00, 0x00, 0x00, 0x00, 818 0x00, 0x00, 0x00, 0x00,
819 0x00, 0x00, 0x00, 0x01, 819 0x00, 0x00, 0x00, 0x01,
820 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 820 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
821 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 821 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
822 0x00, 0x00, 0x00, 0x11, 822 0x00, 0x00, 0x00, 0x11,
823 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 823 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -827,7 +827,7 @@ public class PcepTEReportMsgTest { ...@@ -827,7 +827,7 @@ public class PcepTEReportMsgTest {
827 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 827 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
828 0x00, 0x00, 0x00, 0x11, 828 0x00, 0x00, 0x00, 0x11,
829 0x00, 0x00, 0x00, 0x11, 829 0x00, 0x00, 0x00, 0x11,
830 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 830 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
831 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 831 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
832 0x00, 0x00, 0x00, 0x11, 832 0x00, 0x00, 0x00, 0x11,
833 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 833 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -837,7 +837,7 @@ public class PcepTEReportMsgTest { ...@@ -837,7 +837,7 @@ public class PcepTEReportMsgTest {
837 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 837 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
838 0x00, 0x00, 0x00, 0x11, 838 0x00, 0x00, 0x00, 0x11,
839 0x00, 0x00, 0x00, 0x11, 839 0x00, 0x00, 0x00, 0x11,
840 - 0x04, 0x2E, 0x00, 0x04, //TELinkDescriptorsTLV 840 + 0x04, 0x2E, 0x00, 0x00, //TELinkDescriptorsTLV
841 }; 841 };
842 842
843 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 843 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
...@@ -877,7 +877,7 @@ public class PcepTEReportMsgTest { ...@@ -877,7 +877,7 @@ public class PcepTEReportMsgTest {
877 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 877 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
878 0x00, 0x00, 0x00, 0x00, 878 0x00, 0x00, 0x00, 0x00,
879 0x00, 0x00, 0x00, 0x01, 879 0x00, 0x00, 0x00, 0x01,
880 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 880 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
881 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 881 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
882 0x00, 0x00, 0x00, 0x11, 882 0x00, 0x00, 0x00, 0x11,
883 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 883 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -887,7 +887,7 @@ public class PcepTEReportMsgTest { ...@@ -887,7 +887,7 @@ public class PcepTEReportMsgTest {
887 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 887 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
888 0x00, 0x00, 0x00, 0x11, 888 0x00, 0x00, 0x00, 0x11,
889 0x00, 0x00, 0x00, 0x11, 889 0x00, 0x00, 0x00, 0x11,
890 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 890 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
891 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 891 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
892 0x00, 0x00, 0x00, 0x11, 892 0x00, 0x00, 0x00, 0x11,
893 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 893 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -897,7 +897,7 @@ public class PcepTEReportMsgTest { ...@@ -897,7 +897,7 @@ public class PcepTEReportMsgTest {
897 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 897 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
898 0x00, 0x00, 0x00, 0x11, 898 0x00, 0x00, 0x00, 0x11,
899 0x00, 0x00, 0x00, 0x11, 899 0x00, 0x00, 0x00, 0x11,
900 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 900 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
901 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 901 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
902 0x01, 0x11, 0x00, 0x09, 902 0x01, 0x11, 0x00, 0x09,
903 0x01, 0x21, 0x00, 0x09, 903 0x01, 0x21, 0x00, 0x09,
...@@ -905,7 +905,7 @@ public class PcepTEReportMsgTest { ...@@ -905,7 +905,7 @@ public class PcepTEReportMsgTest {
905 0x01, 0x01, 0x01, 0x01, 905 0x01, 0x01, 0x01, 0x01,
906 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 906 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
907 0x01, 0x011, 0x01, 0x10, 907 0x01, 0x011, 0x01, 0x10,
908 - 0x04, (byte) 0xF3, 0x00, 0x34, //TENodeAttributesTlv 908 + 0x04, (byte) 0xF3, 0x00, 0x30, //TENodeAttributesTlv
909 0x00, 0x0E, 0x00, 0x01, //NodeFlagBitsTlv 909 0x00, 0x0E, 0x00, 0x01, //NodeFlagBitsTlv
910 (byte) 0x90, 0x00, 0x00, 0x00, 910 (byte) 0x90, 0x00, 0x00, 0x00,
911 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 911 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
...@@ -958,7 +958,7 @@ public class PcepTEReportMsgTest { ...@@ -958,7 +958,7 @@ public class PcepTEReportMsgTest {
958 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 958 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
959 0x00, 0x00, 0x00, 0x00, 959 0x00, 0x00, 0x00, 0x00,
960 0x00, 0x00, 0x00, 0x01, 960 0x00, 0x00, 0x00, 0x01,
961 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 961 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
962 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 962 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
963 0x00, 0x00, 0x00, 0x11, 963 0x00, 0x00, 0x00, 0x11,
964 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 964 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -968,7 +968,7 @@ public class PcepTEReportMsgTest { ...@@ -968,7 +968,7 @@ public class PcepTEReportMsgTest {
968 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 968 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
969 0x00, 0x00, 0x00, 0x11, 969 0x00, 0x00, 0x00, 0x11,
970 0x00, 0x00, 0x00, 0x11, 970 0x00, 0x00, 0x00, 0x11,
971 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 971 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
972 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 972 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
973 0x00, 0x00, 0x00, 0x11, 973 0x00, 0x00, 0x00, 0x11,
974 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 974 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -978,7 +978,7 @@ public class PcepTEReportMsgTest { ...@@ -978,7 +978,7 @@ public class PcepTEReportMsgTest {
978 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 978 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
979 0x00, 0x00, 0x00, 0x11, 979 0x00, 0x00, 0x00, 0x11,
980 0x00, 0x00, 0x00, 0x11, 980 0x00, 0x00, 0x00, 0x11,
981 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 981 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
982 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 982 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
983 0x01, 0x11, 0x00, 0x09, 983 0x01, 0x11, 0x00, 0x09,
984 0x01, 0x21, 0x00, 0x09, 984 0x01, 0x21, 0x00, 0x09,
...@@ -986,7 +986,7 @@ public class PcepTEReportMsgTest { ...@@ -986,7 +986,7 @@ public class PcepTEReportMsgTest {
986 0x01, 0x01, 0x01, 0x01, 986 0x01, 0x01, 0x01, 0x01,
987 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 987 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
988 0x01, 0x011, 0x01, 0x10, 988 0x01, 0x011, 0x01, 0x10,
989 - 0x04, (byte) 0xF3, 0x00, 0x34, //TENodeAttributesTlv 989 + 0x04, (byte) 0xF3, 0x00, 0x30, //TENodeAttributesTlv
990 0x00, 0x0E, 0x00, 0x01, //NodeFlagBitsTlv 990 0x00, 0x0E, 0x00, 0x01, //NodeFlagBitsTlv
991 (byte) 0x90, 0x00, 0x00, 0x00, 991 (byte) 0x90, 0x00, 0x00, 0x00,
992 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 992 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
...@@ -1039,7 +1039,7 @@ public class PcepTEReportMsgTest { ...@@ -1039,7 +1039,7 @@ public class PcepTEReportMsgTest {
1039 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 1039 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
1040 0x00, 0x00, 0x00, 0x00, 1040 0x00, 0x00, 0x00, 0x00,
1041 0x00, 0x00, 0x00, 0x01, 1041 0x00, 0x00, 0x00, 0x01,
1042 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 1042 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
1043 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1043 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1044 0x00, 0x00, 0x00, 0x11, 1044 0x00, 0x00, 0x00, 0x11,
1045 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1045 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1049,7 +1049,7 @@ public class PcepTEReportMsgTest { ...@@ -1049,7 +1049,7 @@ public class PcepTEReportMsgTest {
1049 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1049 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1050 0x00, 0x00, 0x00, 0x11, 1050 0x00, 0x00, 0x00, 0x11,
1051 0x00, 0x00, 0x00, 0x11, 1051 0x00, 0x00, 0x00, 0x11,
1052 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 1052 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
1053 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1053 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1054 0x00, 0x00, 0x00, 0x11, 1054 0x00, 0x00, 0x00, 0x11,
1055 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1055 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1059,7 +1059,7 @@ public class PcepTEReportMsgTest { ...@@ -1059,7 +1059,7 @@ public class PcepTEReportMsgTest {
1059 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1059 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1060 0x00, 0x00, 0x00, 0x11, 1060 0x00, 0x00, 0x00, 0x11,
1061 0x00, 0x00, 0x00, 0x11, 1061 0x00, 0x00, 0x00, 0x11,
1062 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 1062 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
1063 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 1063 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
1064 0x01, 0x11, 0x00, 0x09, 1064 0x01, 0x11, 0x00, 0x09,
1065 0x01, 0x21, 0x00, 0x09, 1065 0x01, 0x21, 0x00, 0x09,
...@@ -1067,7 +1067,7 @@ public class PcepTEReportMsgTest { ...@@ -1067,7 +1067,7 @@ public class PcepTEReportMsgTest {
1067 0x01, 0x01, 0x01, 0x01, 1067 0x01, 0x01, 0x01, 0x01,
1068 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 1068 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
1069 0x01, 0x011, 0x01, 0x10, 1069 0x01, 0x011, 0x01, 0x10,
1070 - 0x04, (byte) 0xF3, 0x00, 0x2C, //TENodeAttributesTlv 1070 + 0x04, (byte) 0xF3, 0x00, 0x28, //TENodeAttributesTlv
1071 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 1071 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
1072 0x01, 0x011, 0x01, 0x10, 1072 0x01, 0x011, 0x01, 0x10,
1073 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv 1073 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv
...@@ -1118,7 +1118,7 @@ public class PcepTEReportMsgTest { ...@@ -1118,7 +1118,7 @@ public class PcepTEReportMsgTest {
1118 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 1118 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
1119 0x00, 0x00, 0x00, 0x00, 1119 0x00, 0x00, 0x00, 0x00,
1120 0x00, 0x00, 0x00, 0x01, 1120 0x00, 0x00, 0x00, 0x01,
1121 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 1121 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
1122 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1122 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1123 0x00, 0x00, 0x00, 0x11, 1123 0x00, 0x00, 0x00, 0x11,
1124 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1124 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1128,7 +1128,7 @@ public class PcepTEReportMsgTest { ...@@ -1128,7 +1128,7 @@ public class PcepTEReportMsgTest {
1128 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1128 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1129 0x00, 0x00, 0x00, 0x11, 1129 0x00, 0x00, 0x00, 0x11,
1130 0x00, 0x00, 0x00, 0x11, 1130 0x00, 0x00, 0x00, 0x11,
1131 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 1131 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
1132 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1132 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1133 0x00, 0x00, 0x00, 0x11, 1133 0x00, 0x00, 0x00, 0x11,
1134 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1134 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1138,7 +1138,7 @@ public class PcepTEReportMsgTest { ...@@ -1138,7 +1138,7 @@ public class PcepTEReportMsgTest {
1138 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1138 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1139 0x00, 0x00, 0x00, 0x11, 1139 0x00, 0x00, 0x00, 0x11,
1140 0x00, 0x00, 0x00, 0x11, 1140 0x00, 0x00, 0x00, 0x11,
1141 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 1141 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
1142 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 1142 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
1143 0x01, 0x11, 0x00, 0x09, 1143 0x01, 0x11, 0x00, 0x09,
1144 0x01, 0x21, 0x00, 0x09, 1144 0x01, 0x21, 0x00, 0x09,
...@@ -1146,7 +1146,7 @@ public class PcepTEReportMsgTest { ...@@ -1146,7 +1146,7 @@ public class PcepTEReportMsgTest {
1146 0x01, 0x01, 0x01, 0x01, 1146 0x01, 0x01, 0x01, 0x01,
1147 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 1147 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
1148 0x01, 0x011, 0x01, 0x10, 1148 0x01, 0x011, 0x01, 0x10,
1149 - 0x04, (byte) 0xF3, 0x00, 0x20, //TENodeAttributesTlv 1149 + 0x04, (byte) 0xF3, 0x00, 0x1C, //TENodeAttributesTlv
1150 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 1150 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
1151 0x01, 0x011, 0x01, 0x10, 1151 0x01, 0x011, 0x01, 0x10,
1152 0x00, 0x6B, 0x00, 0x08, //ISISAreaIdentifierTlv 1152 0x00, 0x6B, 0x00, 0x08, //ISISAreaIdentifierTlv
...@@ -1192,13 +1192,13 @@ public class PcepTEReportMsgTest { ...@@ -1192,13 +1192,13 @@ public class PcepTEReportMsgTest {
1192 @Test 1192 @Test
1193 public void teReportMessageTest22() throws PcepParseException { 1193 public void teReportMessageTest22() throws PcepParseException {
1194 1194
1195 - byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x20, // common header 1195 + byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x120, // common header
1196 0x0E, 0x10, 0x01, (byte) 0x1C, // TE Object Header 1196 0x0E, 0x10, 0x01, (byte) 0x1C, // TE Object Header
1197 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID 1197 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID
1198 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 1198 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
1199 0x00, 0x00, 0x00, 0x00, 1199 0x00, 0x00, 0x00, 0x00,
1200 0x00, 0x00, 0x00, 0x01, 1200 0x00, 0x00, 0x00, 0x01,
1201 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 1201 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
1202 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1202 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1203 0x00, 0x00, 0x00, 0x11, 1203 0x00, 0x00, 0x00, 0x11,
1204 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1204 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1208,7 +1208,7 @@ public class PcepTEReportMsgTest { ...@@ -1208,7 +1208,7 @@ public class PcepTEReportMsgTest {
1208 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1208 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1209 0x00, 0x00, 0x00, 0x11, 1209 0x00, 0x00, 0x00, 0x11,
1210 0x00, 0x00, 0x00, 0x11, 1210 0x00, 0x00, 0x00, 0x11,
1211 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 1211 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
1212 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1212 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1213 0x00, 0x00, 0x00, 0x11, 1213 0x00, 0x00, 0x00, 0x11,
1214 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1214 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1218,7 +1218,7 @@ public class PcepTEReportMsgTest { ...@@ -1218,7 +1218,7 @@ public class PcepTEReportMsgTest {
1218 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1218 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1219 0x00, 0x00, 0x00, 0x11, 1219 0x00, 0x00, 0x00, 0x11,
1220 0x00, 0x00, 0x00, 0x11, 1220 0x00, 0x00, 0x00, 0x11,
1221 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 1221 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
1222 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 1222 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
1223 0x01, 0x11, 0x00, 0x09, 1223 0x01, 0x11, 0x00, 0x09,
1224 0x01, 0x21, 0x00, 0x09, 1224 0x01, 0x21, 0x00, 0x09,
...@@ -1226,7 +1226,7 @@ public class PcepTEReportMsgTest { ...@@ -1226,7 +1226,7 @@ public class PcepTEReportMsgTest {
1226 0x01, 0x01, 0x01, 0x01, 1226 0x01, 0x01, 0x01, 0x01,
1227 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 1227 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
1228 0x01, 0x011, 0x01, 0x10, 1228 0x01, 0x011, 0x01, 0x10,
1229 - 0x04, (byte) 0xF3, 0x00, 0x2C, //TENodeAttributesTlv 1229 + 0x04, (byte) 0xF3, 0x00, 0x28, //TENodeAttributesTlv
1230 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 1230 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
1231 0x01, 0x011, 0x01, 0x10, 1231 0x01, 0x011, 0x01, 0x10,
1232 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv 1232 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv
...@@ -1237,7 +1237,7 @@ public class PcepTEReportMsgTest { ...@@ -1237,7 +1237,7 @@ public class PcepTEReportMsgTest {
1237 0x20, 0x01, 0x22, 0x01, 1237 0x20, 0x01, 0x22, 0x01,
1238 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv 1238 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv
1239 0x00, 0x01, 0x01, 0x02, 1239 0x00, 0x01, 0x01, 0x02,
1240 - 0x07, 0x69, 0x00, 0x68, //TELinkAttributesTlv 1240 + 0x07, 0x69, 0x00, 0x64, //TELinkAttributesTlv
1241 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv 1241 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv
1242 0x00, 0x07, 0x08, 0x00, 1242 0x00, 0x07, 0x08, 0x00,
1243 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv 1243 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv
...@@ -1301,13 +1301,13 @@ public class PcepTEReportMsgTest { ...@@ -1301,13 +1301,13 @@ public class PcepTEReportMsgTest {
1301 @Test 1301 @Test
1302 public void teReportMessageTest23() throws PcepParseException { 1302 public void teReportMessageTest23() throws PcepParseException {
1303 1303
1304 - byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x18, // common header 1304 + byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x118, // common header
1305 0x0E, 0x10, 0x01, (byte) 0x14, // TE Object Header 1305 0x0E, 0x10, 0x01, (byte) 0x14, // TE Object Header
1306 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID 1306 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID
1307 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 1307 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
1308 0x00, 0x00, 0x00, 0x00, 1308 0x00, 0x00, 0x00, 0x00,
1309 0x00, 0x00, 0x00, 0x01, 1309 0x00, 0x00, 0x00, 0x01,
1310 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 1310 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
1311 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1311 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1312 0x00, 0x00, 0x00, 0x11, 1312 0x00, 0x00, 0x00, 0x11,
1313 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1313 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1317,7 +1317,7 @@ public class PcepTEReportMsgTest { ...@@ -1317,7 +1317,7 @@ public class PcepTEReportMsgTest {
1317 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1317 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1318 0x00, 0x00, 0x00, 0x11, 1318 0x00, 0x00, 0x00, 0x11,
1319 0x00, 0x00, 0x00, 0x11, 1319 0x00, 0x00, 0x00, 0x11,
1320 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 1320 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
1321 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1321 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1322 0x00, 0x00, 0x00, 0x11, 1322 0x00, 0x00, 0x00, 0x11,
1323 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1323 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1327,7 +1327,7 @@ public class PcepTEReportMsgTest { ...@@ -1327,7 +1327,7 @@ public class PcepTEReportMsgTest {
1327 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1327 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1328 0x00, 0x00, 0x00, 0x11, 1328 0x00, 0x00, 0x00, 0x11,
1329 0x00, 0x00, 0x00, 0x11, 1329 0x00, 0x00, 0x00, 0x11,
1330 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 1330 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
1331 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 1331 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
1332 0x01, 0x11, 0x00, 0x09, 1332 0x01, 0x11, 0x00, 0x09,
1333 0x01, 0x21, 0x00, 0x09, 1333 0x01, 0x21, 0x00, 0x09,
...@@ -1335,7 +1335,7 @@ public class PcepTEReportMsgTest { ...@@ -1335,7 +1335,7 @@ public class PcepTEReportMsgTest {
1335 0x01, 0x01, 0x01, 0x01, 1335 0x01, 0x01, 0x01, 0x01,
1336 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 1336 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
1337 0x01, 0x011, 0x01, 0x10, 1337 0x01, 0x011, 0x01, 0x10,
1338 - 0x04, (byte) 0xF3, 0x00, 0x2C, //TENodeAttributesTlv 1338 + 0x04, (byte) 0xF3, 0x00, 0x28, //TENodeAttributesTlv
1339 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 1339 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
1340 0x01, 0x011, 0x01, 0x10, 1340 0x01, 0x011, 0x01, 0x10,
1341 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv 1341 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv
...@@ -1346,7 +1346,7 @@ public class PcepTEReportMsgTest { ...@@ -1346,7 +1346,7 @@ public class PcepTEReportMsgTest {
1346 0x20, 0x01, 0x22, 0x01, 1346 0x20, 0x01, 0x22, 0x01,
1347 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv 1347 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv
1348 0x00, 0x01, 0x01, 0x02, 1348 0x00, 0x01, 0x01, 0x02,
1349 - 0x07, 0x69, 0x00, 0x60, //TELinkAttributesTlv 1349 + 0x07, 0x69, 0x00, 0x5C, //TELinkAttributesTlv
1350 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv 1350 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv
1351 0x00, 0x07, 0x08, 0x00, 1351 0x00, 0x07, 0x08, 0x00,
1352 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv 1352 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv
...@@ -1407,13 +1407,13 @@ public class PcepTEReportMsgTest { ...@@ -1407,13 +1407,13 @@ public class PcepTEReportMsgTest {
1407 @Test 1407 @Test
1408 public void teReportMessageTest24() throws PcepParseException { 1408 public void teReportMessageTest24() throws PcepParseException {
1409 1409
1410 - byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x10, // common header 1410 + byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x110, // common header
1411 0x0E, 0x10, 0x01, (byte) 0x0C, // TE Object Header 1411 0x0E, 0x10, 0x01, (byte) 0x0C, // TE Object Header
1412 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID 1412 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID
1413 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 1413 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
1414 0x00, 0x00, 0x00, 0x00, 1414 0x00, 0x00, 0x00, 0x00,
1415 0x00, 0x00, 0x00, 0x01, 1415 0x00, 0x00, 0x00, 0x01,
1416 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 1416 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
1417 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1417 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1418 0x00, 0x00, 0x00, 0x11, 1418 0x00, 0x00, 0x00, 0x11,
1419 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1419 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1423,7 +1423,7 @@ public class PcepTEReportMsgTest { ...@@ -1423,7 +1423,7 @@ public class PcepTEReportMsgTest {
1423 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1423 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1424 0x00, 0x00, 0x00, 0x11, 1424 0x00, 0x00, 0x00, 0x11,
1425 0x00, 0x00, 0x00, 0x11, 1425 0x00, 0x00, 0x00, 0x11,
1426 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 1426 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
1427 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1427 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1428 0x00, 0x00, 0x00, 0x11, 1428 0x00, 0x00, 0x00, 0x11,
1429 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1429 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1433,7 +1433,7 @@ public class PcepTEReportMsgTest { ...@@ -1433,7 +1433,7 @@ public class PcepTEReportMsgTest {
1433 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1433 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1434 0x00, 0x00, 0x00, 0x11, 1434 0x00, 0x00, 0x00, 0x11,
1435 0x00, 0x00, 0x00, 0x11, 1435 0x00, 0x00, 0x00, 0x11,
1436 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 1436 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
1437 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 1437 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
1438 0x01, 0x11, 0x00, 0x09, 1438 0x01, 0x11, 0x00, 0x09,
1439 0x01, 0x21, 0x00, 0x09, 1439 0x01, 0x21, 0x00, 0x09,
...@@ -1441,7 +1441,7 @@ public class PcepTEReportMsgTest { ...@@ -1441,7 +1441,7 @@ public class PcepTEReportMsgTest {
1441 0x01, 0x01, 0x01, 0x01, 1441 0x01, 0x01, 0x01, 0x01,
1442 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 1442 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
1443 0x01, 0x011, 0x01, 0x10, 1443 0x01, 0x011, 0x01, 0x10,
1444 - 0x04, (byte) 0xF3, 0x00, 0x2C, //TENodeAttributesTlv 1444 + 0x04, (byte) 0xF3, 0x00, 0x28, //TENodeAttributesTlv
1445 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 1445 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
1446 0x01, 0x011, 0x01, 0x10, 1446 0x01, 0x011, 0x01, 0x10,
1447 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv 1447 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv
...@@ -1452,7 +1452,7 @@ public class PcepTEReportMsgTest { ...@@ -1452,7 +1452,7 @@ public class PcepTEReportMsgTest {
1452 0x20, 0x01, 0x22, 0x01, 1452 0x20, 0x01, 0x22, 0x01,
1453 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv 1453 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv
1454 0x00, 0x01, 0x01, 0x02, 1454 0x00, 0x01, 0x01, 0x02,
1455 - 0x07, 0x69, 0x00, 0x58, //TELinkAttributesTlv 1455 + 0x07, 0x69, 0x00, 0x54, //TELinkAttributesTlv
1456 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv 1456 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv
1457 0x00, 0x07, 0x08, 0x00, 1457 0x00, 0x07, 0x08, 0x00,
1458 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv 1458 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv
...@@ -1511,13 +1511,13 @@ public class PcepTEReportMsgTest { ...@@ -1511,13 +1511,13 @@ public class PcepTEReportMsgTest {
1511 @Test 1511 @Test
1512 public void teReportMessageTest25() throws PcepParseException { 1512 public void teReportMessageTest25() throws PcepParseException {
1513 1513
1514 - byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, 0x04, // common header 1514 + byte[] teReportMsg = new byte[]{0x20, 0x0E, 0x01, (byte) 0x104, // common header
1515 0x0E, 0x10, 0x01, 0x00, // TE Object Header 1515 0x0E, 0x10, 0x01, 0x00, // TE Object Header
1516 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID 1516 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x10, // TE-ID
1517 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV 1517 0x00, 0x0E, 0x00, 0x08, // Routing Universe TLV
1518 0x00, 0x00, 0x00, 0x00, 1518 0x00, 0x00, 0x00, 0x00,
1519 0x00, 0x00, 0x00, 0x01, 1519 0x00, 0x00, 0x00, 0x01,
1520 - 0x06, 0x65, 0x00, 0x28, // Local TE Node Descriptors TLV 1520 + 0x06, 0x65, 0x00, 0x24, // Local TE Node Descriptors TLV
1521 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1521 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1522 0x00, 0x00, 0x00, 0x11, 1522 0x00, 0x00, 0x00, 0x11,
1523 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1523 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1527,7 +1527,7 @@ public class PcepTEReportMsgTest { ...@@ -1527,7 +1527,7 @@ public class PcepTEReportMsgTest {
1527 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1527 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1528 0x00, 0x00, 0x00, 0x11, 1528 0x00, 0x00, 0x00, 0x11,
1529 0x00, 0x00, 0x00, 0x11, 1529 0x00, 0x00, 0x00, 0x11,
1530 - 0x03, (byte) 0xEB, 0x00, 0x28, //RemoteTENodeDescriptorsTLV 1530 + 0x03, (byte) 0xEB, 0x00, 0x24, //RemoteTENodeDescriptorsTLV
1531 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv 1531 0x00, 0x64, 0x00, 0x04, //AutonomousSystemTlv
1532 0x00, 0x00, 0x00, 0x11, 1532 0x00, 0x00, 0x00, 0x11,
1533 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv 1533 0x00, 0x11, 0x00, 0x04, //BGPLSidentifierTlv
...@@ -1537,7 +1537,7 @@ public class PcepTEReportMsgTest { ...@@ -1537,7 +1537,7 @@ public class PcepTEReportMsgTest {
1537 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv 1537 0x03, (byte) 0xE8, 0x00, 0x08, //RouterIDSubTlv
1538 0x00, 0x00, 0x00, 0x11, 1538 0x00, 0x00, 0x00, 0x11,
1539 0x00, 0x00, 0x00, 0x11, 1539 0x00, 0x00, 0x00, 0x11,
1540 - 0x04, 0x2E, 0x00, 0x20, //TELinkDescriptorsTLV 1540 + 0x04, 0x2E, 0x00, 0x1C, //TELinkDescriptorsTLV
1541 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv 1541 0x00, 0x04, 0x00, 0x08, //LinkLocalRemoteIdentifiersTlv
1542 0x01, 0x11, 0x00, 0x09, 1542 0x01, 0x11, 0x00, 0x09,
1543 0x01, 0x21, 0x00, 0x09, 1543 0x01, 0x21, 0x00, 0x09,
...@@ -1545,7 +1545,7 @@ public class PcepTEReportMsgTest { ...@@ -1545,7 +1545,7 @@ public class PcepTEReportMsgTest {
1545 0x01, 0x01, 0x01, 0x01, 1545 0x01, 0x01, 0x01, 0x01,
1546 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv 1546 0x00, 0x08, 0x00, 0x04, //IPv4NeighborAddressTlv
1547 0x01, 0x011, 0x01, 0x10, 1547 0x01, 0x011, 0x01, 0x10,
1548 - 0x04, (byte) 0xF3, 0x00, 0x2C, //TENodeAttributesTlv 1548 + 0x04, (byte) 0xF3, 0x00, 0x28, //TENodeAttributesTlv
1549 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv 1549 0x03, (byte) 0xE9, 0x00, 0x04, //OpaqueNodeAttributeTlv
1550 0x01, 0x011, 0x01, 0x10, 1550 0x01, 0x011, 0x01, 0x10,
1551 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv 1551 0x03, (byte) 0xEF, 0x00, 0x08, //NodeNameTlv
...@@ -1556,7 +1556,7 @@ public class PcepTEReportMsgTest { ...@@ -1556,7 +1556,7 @@ public class PcepTEReportMsgTest {
1556 0x20, 0x01, 0x22, 0x01, 1556 0x20, 0x01, 0x22, 0x01,
1557 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv 1557 0x00, (byte) 0x86, 0x00, 0x04, //IPv4TERouterIdOfLocalNodeTlv
1558 0x00, 0x01, 0x01, 0x02, 1558 0x00, 0x01, 0x01, 0x02,
1559 - 0x07, 0x69, 0x00, 0x4C, //TELinkAttributesTlv 1559 + 0x07, 0x69, 0x00, 0x48, //TELinkAttributesTlv
1560 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv 1560 0x05, 0x3C, 0x00, 0x04, //IPv4TERouterIdOfRemoteNodeTlv
1561 0x00, 0x07, 0x08, 0x00, 1561 0x00, 0x07, 0x08, 0x00,
1562 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv 1562 0x00, 0x03, 0x00, 0x04, //AdministrativeGroupTlv
......
...@@ -16,11 +16,13 @@ ...@@ -16,11 +16,13 @@
16 package org.onosproject.pcepio; 16 package org.onosproject.pcepio;
17 17
18 import static org.hamcrest.core.Is.is; 18 import static org.hamcrest.core.Is.is;
19 -import static org.hamcrest.core.IsSame.sameInstance; 19 +import static org.hamcrest.Matchers.instanceOf;
20 20
21 import org.jboss.netty.buffer.ChannelBuffer; 21 import org.jboss.netty.buffer.ChannelBuffer;
22 import org.jboss.netty.buffer.ChannelBuffers; 22 import org.jboss.netty.buffer.ChannelBuffers;
23 +
23 import static org.hamcrest.MatcherAssert.assertThat; 24 import static org.hamcrest.MatcherAssert.assertThat;
25 +
24 import org.junit.Test; 26 import org.junit.Test;
25 import org.onosproject.pcepio.exceptions.PcepParseException; 27 import org.onosproject.pcepio.exceptions.PcepParseException;
26 import org.onosproject.pcepio.protocol.PcepFactories; 28 import org.onosproject.pcepio.protocol.PcepFactories;
...@@ -31,7 +33,7 @@ import org.onosproject.pcepio.protocol.PcepUpdateMsg; ...@@ -31,7 +33,7 @@ import org.onosproject.pcepio.protocol.PcepUpdateMsg;
31 /** 33 /**
32 * Test cases for PCEP update message. 34 * Test cases for PCEP update message.
33 */ 35 */
34 -public class PcepUpdateMsgTest2 { 36 +public class PcepUpdateMsgExtTest {
35 37
36 /** 38 /**
37 * This test case is for SRP object(symbolic path tlv), LSP object(StatefulLspDbVerTlv), ERO object, 39 * This test case is for SRP object(symbolic path tlv), LSP object(StatefulLspDbVerTlv), ERO object,
...@@ -66,8 +68,8 @@ public class PcepUpdateMsgTest2 { ...@@ -66,8 +68,8 @@ public class PcepUpdateMsgTest2 {
66 PcepMessage message = null; 68 PcepMessage message = null;
67 69
68 message = reader.readFrom(buffer); 70 message = reader.readFrom(buffer);
69 - assertThat(message, sameInstance((PcepUpdateMsg) message));
70 71
72 + assertThat(message, instanceOf(PcepUpdateMsg.class));
71 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 73 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
72 message.writeTo(buf); 74 message.writeTo(buf);
73 testupdateMsg = buf.array(); 75 testupdateMsg = buf.array();
...@@ -108,7 +110,7 @@ public class PcepUpdateMsgTest2 { ...@@ -108,7 +110,7 @@ public class PcepUpdateMsgTest2 {
108 110
109 message = reader.readFrom(buffer); 111 message = reader.readFrom(buffer);
110 112
111 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 113 + assertThat(message, instanceOf(PcepUpdateMsg.class));
112 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 114 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
113 message.writeTo(buf); 115 message.writeTo(buf);
114 testupdateMsg = buf.array(); 116 testupdateMsg = buf.array();
...@@ -146,7 +148,7 @@ public class PcepUpdateMsgTest2 { ...@@ -146,7 +148,7 @@ public class PcepUpdateMsgTest2 {
146 148
147 message = reader.readFrom(buffer); 149 message = reader.readFrom(buffer);
148 150
149 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 151 + assertThat(message, instanceOf(PcepUpdateMsg.class));
150 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 152 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
151 message.writeTo(buf); 153 message.writeTo(buf);
152 testupdateMsg = buf.array(); 154 testupdateMsg = buf.array();
...@@ -185,7 +187,7 @@ public class PcepUpdateMsgTest2 { ...@@ -185,7 +187,7 @@ public class PcepUpdateMsgTest2 {
185 187
186 message = reader.readFrom(buffer); 188 message = reader.readFrom(buffer);
187 189
188 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 190 + assertThat(message, instanceOf(PcepUpdateMsg.class));
189 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 191 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
190 message.writeTo(buf); 192 message.writeTo(buf);
191 testupdateMsg = buf.array(); 193 testupdateMsg = buf.array();
...@@ -225,7 +227,7 @@ public class PcepUpdateMsgTest2 { ...@@ -225,7 +227,7 @@ public class PcepUpdateMsgTest2 {
225 227
226 message = reader.readFrom(buffer); 228 message = reader.readFrom(buffer);
227 229
228 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 230 + assertThat(message, instanceOf(PcepUpdateMsg.class));
229 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 231 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
230 message.writeTo(buf); 232 message.writeTo(buf);
231 testupdateMsg = buf.array(); 233 testupdateMsg = buf.array();
...@@ -264,7 +266,7 @@ public class PcepUpdateMsgTest2 { ...@@ -264,7 +266,7 @@ public class PcepUpdateMsgTest2 {
264 266
265 message = reader.readFrom(buffer); 267 message = reader.readFrom(buffer);
266 268
267 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 269 + assertThat(message, instanceOf(PcepUpdateMsg.class));
268 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 270 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
269 message.writeTo(buf); 271 message.writeTo(buf);
270 testupdateMsg = buf.array(); 272 testupdateMsg = buf.array();
...@@ -304,7 +306,7 @@ public class PcepUpdateMsgTest2 { ...@@ -304,7 +306,7 @@ public class PcepUpdateMsgTest2 {
304 306
305 message = reader.readFrom(buffer); 307 message = reader.readFrom(buffer);
306 308
307 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 309 + assertThat(message, instanceOf(PcepUpdateMsg.class));
308 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 310 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
309 message.writeTo(buf); 311 message.writeTo(buf);
310 testupdateMsg = buf.array(); 312 testupdateMsg = buf.array();
...@@ -344,7 +346,7 @@ public class PcepUpdateMsgTest2 { ...@@ -344,7 +346,7 @@ public class PcepUpdateMsgTest2 {
344 346
345 message = reader.readFrom(buffer); 347 message = reader.readFrom(buffer);
346 348
347 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 349 + assertThat(message, instanceOf(PcepUpdateMsg.class));
348 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 350 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
349 message.writeTo(buf); 351 message.writeTo(buf);
350 testupdateMsg = buf.array(); 352 testupdateMsg = buf.array();
...@@ -383,7 +385,7 @@ public class PcepUpdateMsgTest2 { ...@@ -383,7 +385,7 @@ public class PcepUpdateMsgTest2 {
383 385
384 message = reader.readFrom(buffer); 386 message = reader.readFrom(buffer);
385 387
386 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 388 + assertThat(message, instanceOf(PcepUpdateMsg.class));
387 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 389 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
388 message.writeTo(buf); 390 message.writeTo(buf);
389 testupdateMsg = buf.array(); 391 testupdateMsg = buf.array();
...@@ -421,7 +423,7 @@ public class PcepUpdateMsgTest2 { ...@@ -421,7 +423,7 @@ public class PcepUpdateMsgTest2 {
421 423
422 message = reader.readFrom(buffer); 424 message = reader.readFrom(buffer);
423 425
424 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 426 + assertThat(message, instanceOf(PcepUpdateMsg.class));
425 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 427 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
426 message.writeTo(buf); 428 message.writeTo(buf);
427 testupdateMsg = buf.array(); 429 testupdateMsg = buf.array();
...@@ -449,16 +451,18 @@ public class PcepUpdateMsgTest2 { ...@@ -449,16 +451,18 @@ public class PcepUpdateMsgTest2 {
449 0x01, 0x01, 0x04, 0x00, 451 0x01, 0x01, 0x04, 0x00,
450 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object 452 0x09, 0x10, 0x00, 0x14, 0x00, 0x00, 0x00, 0x00, //LSPA object
451 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00, 453 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x07, 0x00, 0x00,
452 - 0x05, 0x20, 0x00, 0x04}; //Bandwidth object 454 + 0x05, 0x20, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00}; //Bandwidth object
453 455
454 byte[] testupdateMsg = {0}; 456 byte[] testupdateMsg = {0};
455 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer(); 457 ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
456 buffer.writeBytes(updateMsg); 458 buffer.writeBytes(updateMsg);
457 459
458 - PcepFactories.getGenericReader(); 460 + PcepMessageReader<PcepMessage> reader = PcepFactories.getGenericReader();
459 PcepMessage message = null; 461 PcepMessage message = null;
460 462
461 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 463 + message = reader.readFrom(buffer);
464 +
465 + assertThat(message, instanceOf(PcepUpdateMsg.class));
462 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 466 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
463 message.writeTo(buf); 467 message.writeTo(buf);
464 testupdateMsg = buf.array(); 468 testupdateMsg = buf.array();
...@@ -496,7 +500,7 @@ public class PcepUpdateMsgTest2 { ...@@ -496,7 +500,7 @@ public class PcepUpdateMsgTest2 {
496 500
497 message = reader.readFrom(buffer); 501 message = reader.readFrom(buffer);
498 502
499 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 503 + assertThat(message, instanceOf(PcepUpdateMsg.class));
500 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 504 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
501 message.writeTo(buf); 505 message.writeTo(buf);
502 testupdateMsg = buf.array(); 506 testupdateMsg = buf.array();
...@@ -535,7 +539,7 @@ public class PcepUpdateMsgTest2 { ...@@ -535,7 +539,7 @@ public class PcepUpdateMsgTest2 {
535 539
536 message = reader.readFrom(buffer); 540 message = reader.readFrom(buffer);
537 541
538 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 542 + assertThat(message, instanceOf(PcepUpdateMsg.class));
539 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 543 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
540 message.writeTo(buf); 544 message.writeTo(buf);
541 testupdateMsg = buf.array(); 545 testupdateMsg = buf.array();
...@@ -575,7 +579,7 @@ public class PcepUpdateMsgTest2 { ...@@ -575,7 +579,7 @@ public class PcepUpdateMsgTest2 {
575 579
576 message = reader.readFrom(buffer); 580 message = reader.readFrom(buffer);
577 581
578 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 582 + assertThat(message, instanceOf(PcepUpdateMsg.class));
579 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 583 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
580 message.writeTo(buf); 584 message.writeTo(buf);
581 testupdateMsg = buf.array(); 585 testupdateMsg = buf.array();
...@@ -612,7 +616,7 @@ public class PcepUpdateMsgTest2 { ...@@ -612,7 +616,7 @@ public class PcepUpdateMsgTest2 {
612 616
613 message = reader.readFrom(buffer); 617 message = reader.readFrom(buffer);
614 618
615 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 619 + assertThat(message, instanceOf(PcepUpdateMsg.class));
616 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 620 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
617 message.writeTo(buf); 621 message.writeTo(buf);
618 testupdateMsg = buf.array(); 622 testupdateMsg = buf.array();
...@@ -650,7 +654,7 @@ public class PcepUpdateMsgTest2 { ...@@ -650,7 +654,7 @@ public class PcepUpdateMsgTest2 {
650 654
651 message = reader.readFrom(buffer); 655 message = reader.readFrom(buffer);
652 656
653 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 657 + assertThat(message, instanceOf(PcepUpdateMsg.class));
654 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 658 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
655 message.writeTo(buf); 659 message.writeTo(buf);
656 testupdateMsg = buf.array(); 660 testupdateMsg = buf.array();
...@@ -689,7 +693,7 @@ public class PcepUpdateMsgTest2 { ...@@ -689,7 +693,7 @@ public class PcepUpdateMsgTest2 {
689 693
690 message = reader.readFrom(buffer); 694 message = reader.readFrom(buffer);
691 695
692 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 696 + assertThat(message, instanceOf(PcepUpdateMsg.class));
693 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 697 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
694 message.writeTo(buf); 698 message.writeTo(buf);
695 testupdateMsg = buf.array(); 699 testupdateMsg = buf.array();
...@@ -727,7 +731,7 @@ public class PcepUpdateMsgTest2 { ...@@ -727,7 +731,7 @@ public class PcepUpdateMsgTest2 {
727 731
728 message = reader.readFrom(buffer); 732 message = reader.readFrom(buffer);
729 733
730 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 734 + assertThat(message, instanceOf(PcepUpdateMsg.class));
731 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 735 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
732 message.writeTo(buf); 736 message.writeTo(buf);
733 testupdateMsg = buf.array(); 737 testupdateMsg = buf.array();
...@@ -766,7 +770,7 @@ public class PcepUpdateMsgTest2 { ...@@ -766,7 +770,7 @@ public class PcepUpdateMsgTest2 {
766 770
767 message = reader.readFrom(buffer); 771 message = reader.readFrom(buffer);
768 772
769 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 773 + assertThat(message, instanceOf(PcepUpdateMsg.class));
770 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 774 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
771 message.writeTo(buf); 775 message.writeTo(buf);
772 testupdateMsg = buf.array(); 776 testupdateMsg = buf.array();
...@@ -805,7 +809,7 @@ public class PcepUpdateMsgTest2 { ...@@ -805,7 +809,7 @@ public class PcepUpdateMsgTest2 {
805 809
806 message = reader.readFrom(buffer); 810 message = reader.readFrom(buffer);
807 811
808 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 812 + assertThat(message, instanceOf(PcepUpdateMsg.class));
809 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 813 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
810 message.writeTo(buf); 814 message.writeTo(buf);
811 testupdateMsg = buf.array(); 815 testupdateMsg = buf.array();
...@@ -841,7 +845,7 @@ public class PcepUpdateMsgTest2 { ...@@ -841,7 +845,7 @@ public class PcepUpdateMsgTest2 {
841 845
842 message = reader.readFrom(buffer); 846 message = reader.readFrom(buffer);
843 847
844 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 848 + assertThat(message, instanceOf(PcepUpdateMsg.class));
845 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 849 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
846 message.writeTo(buf); 850 message.writeTo(buf);
847 testupdateMsg = buf.array(); 851 testupdateMsg = buf.array();
...@@ -878,7 +882,7 @@ public class PcepUpdateMsgTest2 { ...@@ -878,7 +882,7 @@ public class PcepUpdateMsgTest2 {
878 882
879 message = reader.readFrom(buffer); 883 message = reader.readFrom(buffer);
880 884
881 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 885 + assertThat(message, instanceOf(PcepUpdateMsg.class));
882 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 886 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
883 message.writeTo(buf); 887 message.writeTo(buf);
884 testupdateMsg = buf.array(); 888 testupdateMsg = buf.array();
...@@ -916,7 +920,7 @@ public class PcepUpdateMsgTest2 { ...@@ -916,7 +920,7 @@ public class PcepUpdateMsgTest2 {
916 920
917 message = reader.readFrom(buffer); 921 message = reader.readFrom(buffer);
918 922
919 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 923 + assertThat(message, instanceOf(PcepUpdateMsg.class));
920 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 924 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
921 message.writeTo(buf); 925 message.writeTo(buf);
922 testupdateMsg = buf.array(); 926 testupdateMsg = buf.array();
...@@ -953,7 +957,7 @@ public class PcepUpdateMsgTest2 { ...@@ -953,7 +957,7 @@ public class PcepUpdateMsgTest2 {
953 957
954 message = reader.readFrom(buffer); 958 message = reader.readFrom(buffer);
955 959
956 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 960 + assertThat(message, instanceOf(PcepUpdateMsg.class));
957 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 961 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
958 message.writeTo(buf); 962 message.writeTo(buf);
959 testupdateMsg = buf.array(); 963 testupdateMsg = buf.array();
...@@ -991,7 +995,7 @@ public class PcepUpdateMsgTest2 { ...@@ -991,7 +995,7 @@ public class PcepUpdateMsgTest2 {
991 995
992 message = reader.readFrom(buffer); 996 message = reader.readFrom(buffer);
993 997
994 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 998 + assertThat(message, instanceOf(PcepUpdateMsg.class));
995 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 999 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
996 message.writeTo(buf); 1000 message.writeTo(buf);
997 testupdateMsg = buf.array(); 1001 testupdateMsg = buf.array();
...@@ -1030,7 +1034,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1030,7 +1034,7 @@ public class PcepUpdateMsgTest2 {
1030 1034
1031 message = reader.readFrom(buffer); 1035 message = reader.readFrom(buffer);
1032 1036
1033 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1037 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1034 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1038 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1035 message.writeTo(buf); 1039 message.writeTo(buf);
1036 testupdateMsg = buf.array(); 1040 testupdateMsg = buf.array();
...@@ -1065,7 +1069,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1065,7 +1069,7 @@ public class PcepUpdateMsgTest2 {
1065 1069
1066 message = reader.readFrom(buffer); 1070 message = reader.readFrom(buffer);
1067 1071
1068 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1072 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1069 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1073 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1070 message.writeTo(buf); 1074 message.writeTo(buf);
1071 testupdateMsg = buf.array(); 1075 testupdateMsg = buf.array();
...@@ -1101,7 +1105,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1101,7 +1105,7 @@ public class PcepUpdateMsgTest2 {
1101 1105
1102 message = reader.readFrom(buffer); 1106 message = reader.readFrom(buffer);
1103 1107
1104 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1108 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1105 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1109 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1106 message.writeTo(buf); 1110 message.writeTo(buf);
1107 testupdateMsg = buf.array(); 1111 testupdateMsg = buf.array();
...@@ -1140,7 +1144,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1140,7 +1144,7 @@ public class PcepUpdateMsgTest2 {
1140 1144
1141 message = reader.readFrom(buffer); 1145 message = reader.readFrom(buffer);
1142 1146
1143 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1147 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1144 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1148 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1145 message.writeTo(buf); 1149 message.writeTo(buf);
1146 testupdateMsg = buf.array(); 1150 testupdateMsg = buf.array();
...@@ -1178,7 +1182,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1178,7 +1182,7 @@ public class PcepUpdateMsgTest2 {
1178 1182
1179 message = reader.readFrom(buffer); 1183 message = reader.readFrom(buffer);
1180 1184
1181 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1185 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1182 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1186 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1183 message.writeTo(buf); 1187 message.writeTo(buf);
1184 testupdateMsg = buf.array(); 1188 testupdateMsg = buf.array();
...@@ -1216,7 +1220,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1216,7 +1220,7 @@ public class PcepUpdateMsgTest2 {
1216 1220
1217 message = reader.readFrom(buffer); 1221 message = reader.readFrom(buffer);
1218 1222
1219 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1223 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1220 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1224 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1221 message.writeTo(buf); 1225 message.writeTo(buf);
1222 testupdateMsg = buf.array(); 1226 testupdateMsg = buf.array();
...@@ -1256,7 +1260,7 @@ public class PcepUpdateMsgTest2 { ...@@ -1256,7 +1260,7 @@ public class PcepUpdateMsgTest2 {
1256 1260
1257 message = reader.readFrom(buffer); 1261 message = reader.readFrom(buffer);
1258 1262
1259 - assertThat(message, sameInstance((PcepUpdateMsg) message)); 1263 + assertThat(message, instanceOf(PcepUpdateMsg.class));
1260 ChannelBuffer buf = ChannelBuffers.dynamicBuffer(); 1264 ChannelBuffer buf = ChannelBuffers.dynamicBuffer();
1261 message.writeTo(buf); 1265 message.writeTo(buf);
1262 testupdateMsg = buf.array(); 1266 testupdateMsg = buf.array();
......