Test cases renamed and fixed.
Change-Id: I8b8134bbb0300029b83bf0804bdc6d97b7cec43f
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepTEObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepTEObjectVer1.java
index 51122fd..1e770f3 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepTEObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepTEObjectVer1.java
@@ -296,8 +296,7 @@
tlv = LocalTENodeDescriptorsTLV.read(cb, hLength);
break;
case RemoteTENodeDescriptorsTLV.TYPE:
- RemoteTENodeDescriptorsTLV.hLength = hLength;
- tlv = RemoteTENodeDescriptorsTLV.read(cb);
+ tlv = RemoteTENodeDescriptorsTLV.read(cb, hLength);
break;
case TELinkDescriptorsTLV.TYPE:
tlv = TELinkDescriptorsTLV.read(cb, hLength);
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalTENodeDescriptorsTLV.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalTENodeDescriptorsTLV.java
index 4d3df47..5ba6297 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalTENodeDescriptorsTLV.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/LocalTENodeDescriptorsTLV.java
@@ -169,7 +169,7 @@
}
}
hLength = (short) (c.writerIndex() - tlvStartIndex);
- c.setShort(tlvLenIndex, hLength);
+ c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
return c.writerIndex() - tlvStartIndex;
}
@@ -186,7 +186,7 @@
// Node Descriptor Sub-TLVs (variable)
LinkedList<PcepValueType> llNodeDescriptorSubTLVs = new LinkedList<PcepValueType>();
- ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH);
+ ChannelBuffer tempCb = c.readBytes(hLength);
while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java
index 9d9cf73..70cd746 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/PcepRsvpSpecObjHeader.java
@@ -116,40 +116,38 @@
/**
* Writes the byte stream of PcepRsvpObjectHeader to channel buffer.
*
- * @param bb of type channel buffer
+ * @param cb of type channel buffer
* @return object length index
*/
- public int write(ChannelBuffer bb) {
- int objLenIndex = bb.writerIndex();
- bb.writeShort(objLen);
- bb.writeByte(objClassNum);
- bb.writeByte(objClassType);
- return bb.writerIndex() - objLenIndex;
+ public int write(ChannelBuffer cb) {
+ int objLenIndex = cb.writerIndex();
+ objLen = 0;
+ cb.writeShort(objLen);
+ cb.writeByte(objClassNum);
+ cb.writeByte(objClassType);
+ return objLenIndex;
}
/**
* Reads the PcepRsvpObjectHeader.
*
- * @param bb of type channel buffer
+ * @param cb of type channel buffer
* @return PcepRsvpObjectHeader
*/
- public static PcepRsvpSpecObjHeader read(ChannelBuffer bb) {
+ public static PcepRsvpSpecObjHeader read(ChannelBuffer cb) {
byte objClassNum;
byte objClassType;
short objLen;
- objLen = bb.readShort();
- objClassNum = bb.readByte();
- objClassType = bb.readByte();
+ objLen = cb.readShort();
+ objClassNum = cb.readByte();
+ objClassType = cb.readByte();
return new PcepRsvpSpecObjHeader(objLen, objClassNum, objClassType);
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("ObjectClassNum: " , objClassNum)
- .add("ObjectCType: " , objClassType)
- .add("ObjectLength: " , objLen)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("ObjectClassNum: ", objClassNum)
+ .add("ObjectCType: ", objClassType).add("ObjectLength: ", objLen).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteTENodeDescriptorsTLV.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteTENodeDescriptorsTLV.java
index 2a12e07..39ec987 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteTENodeDescriptorsTLV.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/RemoteTENodeDescriptorsTLV.java
@@ -50,7 +50,7 @@
protected static final Logger log = LoggerFactory.getLogger(RemoteTENodeDescriptorsTLV.class);
public static final short TYPE = 1003; //TODD:change this TBD9
- public static short hLength;
+ public short hLength;
public static final int TLV_HEADER_LENGTH = 4;
// Node Descriptor Sub-TLVs (variable)
@@ -172,7 +172,7 @@
}
hLength = (short) (c.writerIndex() - tlvStartIndex);
- c.setShort(tlvLenIndex, hLength);
+ c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
return c.writerIndex() - tlvStartIndex;
}
@@ -184,12 +184,12 @@
* @return object of RemoteTENodeDescriptorsTLV
* @throws PcepParseException if mandatory fields are missing
*/
- public static PcepValueType read(ChannelBuffer c) throws PcepParseException {
+ public static PcepValueType read(ChannelBuffer c , short length) throws PcepParseException {
// Node Descriptor Sub-TLVs (variable)
LinkedList<PcepValueType> llRemoteTENodeDescriptorSubTLVs = new LinkedList<PcepValueType>();
- ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH);
+ ChannelBuffer tempCb = c.readBytes(length);
while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java
index 853991a..d89904e 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/StatefulRsvpErrorSpecTlv.java
@@ -104,7 +104,7 @@
public static final short TYPE = 21;
public static final int OBJECT_HEADER_LENGTH = 4;
- private final short hLength;
+ private short hLength;
private final PcepRsvpErrorSpec rsvpErrSpecObj;
private final boolean isErrSpceObjSet;
@@ -113,12 +113,10 @@
* Constructor to initialize errSpecObj.
*
* @param rsvpErrSpecObj Rsvp error spec object
- * @param hLength length of rsvp error spec object
*/
- public StatefulRsvpErrorSpecTlv(PcepRsvpErrorSpec rsvpErrSpecObj, short hLength) {
+ public StatefulRsvpErrorSpecTlv(PcepRsvpErrorSpec rsvpErrSpecObj) {
this.rsvpErrSpecObj = rsvpErrSpecObj;
this.isErrSpceObjSet = true;
- this.hLength = hLength;
}
/**
@@ -171,7 +169,7 @@
&& PcepRsvpUserErrorSpec.CLASS_TYPE == rsvpErrSpecObjHeader.getObjClassType()) {
rsvpErrSpecObj = PcepRsvpUserErrorSpec.read(cb);
}
- return rsvpErrSpecObj;
+ return new StatefulRsvpErrorSpecTlv(rsvpErrSpecObj);
}
@Override
@@ -196,14 +194,15 @@
int iStartIndex = c.writerIndex();
c.writeShort(TYPE);
int tlvLenIndex = c.writerIndex();
+ hLength = 0;
c.writeShort(hLength);
if (isErrSpceObjSet) {
rsvpErrSpecObj.write(c);
}
- short tlvLen = (short) (c.writerIndex() - iStartIndex + 4);
- c.setShort(tlvLenIndex, tlvLen);
+ hLength = (short) (c.writerIndex() - iStartIndex);
+ c.setShort(tlvLenIndex, (hLength - OBJECT_HEADER_LENGTH));
- return tlvLen;
+ return c.writerIndex() - iStartIndex;
}
@Override
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkAttributesTlv.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkAttributesTlv.java
index 98113d1..6ff9abf 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkAttributesTlv.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkAttributesTlv.java
@@ -63,7 +63,6 @@
*/
public TELinkAttributesTlv(LinkedList<PcepValueType> llLinkAttributesSubTLVs) {
this.llLinkAttributesSubTLVs = llLinkAttributesSubTLVs;
-
}
/**
@@ -171,7 +170,7 @@
}
hLength = (short) (c.writerIndex() - tlvStartIndex);
- c.setShort(tlvLenIndex, hLength);
+ c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
return c.writerIndex() - tlvStartIndex;
}
@@ -189,7 +188,7 @@
// Node Descriptor Sub-TLVs (variable)
LinkedList<PcepValueType> llLinkAttributesSubTLVs = new LinkedList<PcepValueType>();
- ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH);
+ ChannelBuffer tempCb = c.readBytes(hLength);
while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkDescriptorsTLV.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkDescriptorsTLV.java
index 89601be..b4e164c 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkDescriptorsTLV.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TELinkDescriptorsTLV.java
@@ -167,7 +167,7 @@
}
hLength = (short) (c.writerIndex() - tlvStartIndex);
- c.setShort(tlvLenIndex, hLength);
+ c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
return c.writerIndex() - tlvStartIndex;
}
@@ -185,7 +185,7 @@
// Node Descriptor Sub-TLVs (variable)
LinkedList<PcepValueType> llLinkDescriptorsSubTLVs = new LinkedList<PcepValueType>();
- ChannelBuffer tempCb = c.readBytes(length - TLV_HEADER_LENGTH);
+ ChannelBuffer tempCb = c.readBytes(length);
while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TENodeAttributesTlv.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TENodeAttributesTlv.java
index ec17dd6..0ca288c 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TENodeAttributesTlv.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/types/TENodeAttributesTlv.java
@@ -167,7 +167,7 @@
}
hLength = (short) (c.writerIndex() - tlvStartIndex);
- c.setShort(tlvLenIndex, hLength);
+ c.setShort(tlvLenIndex, (hLength - TLV_HEADER_LENGTH));
return c.writerIndex() - tlvStartIndex;
}
@@ -185,7 +185,7 @@
// Node Descriptor Sub-TLVs (variable)
LinkedList<PcepValueType> llNodeAttributesSubTLVs = new LinkedList<PcepValueType>();
- ChannelBuffer tempCb = c.readBytes(hLength - TLV_HEADER_LENGTH);
+ ChannelBuffer tempCb = c.readBytes(hLength);
while (TLV_HEADER_LENGTH <= tempCb.readableBytes()) {
PcepValueType tlv;