PCEP modificaton to support PCEP-LS
Change-Id: Ic829dd17b0398ad76ec412b4e8293de564b5b56b
diff --git a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java
index 594e40c..6fbfb41 100644
--- a/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java
+++ b/protocols/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepErrorInfoVer1.java
@@ -16,6 +16,7 @@
package org.onosproject.pcepio.protocol.ver1;
import java.util.LinkedList;
+import java.util.List;
import java.util.ListIterator;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -24,7 +25,7 @@
import org.onosproject.pcepio.protocol.PcepErrorInfo;
import org.onosproject.pcepio.protocol.PcepErrorObject;
import org.onosproject.pcepio.protocol.PcepRPObject;
-import org.onosproject.pcepio.protocol.PcepTEObject;
+import org.onosproject.pcepio.protocol.PcepLSObject;
import org.onosproject.pcepio.types.PcepObjectHeader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,26 +34,26 @@
/**
* Provides PCEP Error Info.
- * Reference :PCEP Extension for Transporting TE Data draft-dhodylee-pce-pcep-te-data-extn-02.
+ * Reference : draft-dhodylee-pce-pcep-ls-01, section 8.2.
*/
public class PcepErrorInfoVer1 implements PcepErrorInfo {
protected static final Logger log = LoggerFactory.getLogger(PcepErrorInfoVer1.class);
//Error list is optional
- private LinkedList<PcepError> errList;
+ private List<PcepError> errList;
/**
* Constructor to add PCEP error object to the list.
*
* @param llRPObjList list of PCEP RP object
- * @param llTEObjList list of PCEP TE object
+ * @param llLSObjList list of PCEP LS object
* @param llErrObjList list of PCEP error object
*/
- public PcepErrorInfoVer1(LinkedList<PcepRPObject> llRPObjList, LinkedList<PcepTEObject> llTEObjList,
- LinkedList<PcepErrorObject> llErrObjList) {
+ public PcepErrorInfoVer1(List<PcepRPObject> llRPObjList, List<PcepLSObject> llLSObjList,
+ List<PcepErrorObject> llErrObjList) {
this.errList = new LinkedList<>();
if ((llErrObjList != null) && (!llErrObjList.isEmpty())) {
- this.errList.add(new PcepErrorVer1(llRPObjList, llTEObjList, llErrObjList));
+ this.errList.add(new PcepErrorVer1(llRPObjList, llLSObjList, llErrObjList));
}
}
@@ -61,7 +62,7 @@
*
* @param errll linked list or pcep error
*/
- public PcepErrorInfoVer1(LinkedList<PcepError> errll) {
+ public PcepErrorInfoVer1(List<PcepError> errll) {
this.errList = errll;
}
@@ -79,7 +80,7 @@
tempObjHeader = PcepObjectHeader.read(cb);
cb.resetReaderIndex();
byte yObjClass = tempObjHeader.getObjClass();
- if ((yObjClass != PcepRPObjectVer1.RP_OBJ_CLASS) && (yObjClass != PcepTEObjectVer1.TE_OBJ_CLASS)
+ if ((yObjClass != PcepRPObjectVer1.RP_OBJ_CLASS) && (yObjClass != PcepLSObjectVer1.LS_OBJ_CLASS)
&& (yObjClass != PcepErrorObjectVer1.ERROR_OBJ_CLASS)) {
throw new PcepParseException("Unknown Object is present in PCEP-ERROR. Object Class: " + yObjClass);
}
@@ -96,7 +97,7 @@
PcepError pcepError = listIterator.next();
//RP Object list is optional
- LinkedList<PcepRPObject> llRPObjList = pcepError.getRPObjList();
+ List<PcepRPObject> llRPObjList = pcepError.getRPObjList();
if (llRPObjList != null) {
ListIterator<PcepRPObject> rpListIterator = llRPObjList.listIterator();
while (rpListIterator.hasNext()) {
@@ -104,10 +105,10 @@
}
}
- //TE Object list is optional
- LinkedList<PcepTEObject> llTEObjList = pcepError.getTEObjList();
- if (llTEObjList != null) {
- ListIterator<PcepTEObject> teListIterator = llTEObjList.listIterator();
+ //LS Object list is optional
+ List<PcepLSObject> llLSObjList = pcepError.getLSObjList();
+ if (llLSObjList != null) {
+ ListIterator<PcepLSObject> teListIterator = llLSObjList.listIterator();
while (teListIterator.hasNext()) {
teListIterator.next().write(cb);
}
@@ -116,7 +117,7 @@
// <error-obj-list> is mandatory
boolean bIsErrorObjListFound = false;
- LinkedList<PcepErrorObject> llErrObjList = pcepError.getErrorObjList();
+ List<PcepErrorObject> llErrObjList = pcepError.getErrorObjList();
if (llErrObjList != null) {
ListIterator<PcepErrorObject> errObjListIterator = llErrObjList.listIterator();
while (errObjListIterator.hasNext()) {
@@ -132,14 +133,14 @@
}
@Override
- public LinkedList<Integer> getErrorType() {
- LinkedList<Integer> errorType = new LinkedList<>();
+ public List<Integer> getErrorType() {
+ List<Integer> errorType = new LinkedList<>();
ListIterator<PcepError> listIterator = errList.listIterator();
PcepErrorObject errObj;
int error;
while (listIterator.hasNext()) {
PcepError pcepError = listIterator.next();
- LinkedList<PcepErrorObject> llErrObjList = pcepError.getErrorObjList();
+ List<PcepErrorObject> llErrObjList = pcepError.getErrorObjList();
if (llErrObjList != null) {
ListIterator<PcepErrorObject> errObjListIterator = llErrObjList.listIterator();
while (errObjListIterator.hasNext()) {
@@ -153,14 +154,14 @@
}
@Override
- public LinkedList<Integer> getErrorValue() {
- LinkedList<Integer> errorValue = new LinkedList<>();
+ public List<Integer> getErrorValue() {
+ List<Integer> errorValue = new LinkedList<>();
ListIterator<PcepError> listIterator = errList.listIterator();
PcepErrorObject errObj;
int error;
while (listIterator.hasNext()) {
PcepError pcepError = listIterator.next();
- LinkedList<PcepErrorObject> llErrObjList = pcepError.getErrorObjList();
+ List<PcepErrorObject> llErrObjList = pcepError.getErrorObjList();
if (llErrObjList != null) {
ListIterator<PcepErrorObject> errObjListIterator = llErrObjList.listIterator();
while (errObjListIterator.hasNext()) {
@@ -177,7 +178,7 @@
* Builder class for PCEP error info.
*/
public static class Builder implements PcepErrorInfo.Builder {
- private LinkedList<PcepError> errll;
+ private List<PcepError> errll;
@Override
public PcepErrorInfo build() {
@@ -185,12 +186,12 @@
}
@Override
- public LinkedList<PcepError> getPcepErrorList() {
+ public List<PcepError> getPcepErrorList() {
return this.errll;
}
@Override
- public Builder setPcepErrorList(LinkedList<PcepError> errll) {
+ public Builder setPcepErrorList(List<PcepError> errll) {
this.errll = errll;
return this;
}