Removed print method from implementation.
Change-Id: I0bf4238e03c8b6d4aa21c6641f0c0abca855dc11
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcInitiatedLspRequest.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcInitiatedLspRequest.java
index 989636b..6a2fdc8 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcInitiatedLspRequest.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcInitiatedLspRequest.java
@@ -95,11 +95,6 @@
void setPcepAttribute(PcepAttribute pcepAttribute);
/**
- * Prints the attribute of PC-INITIATED LSP INITIATION REQUEST.
- */
- void print();
-
- /**
* Builder interface with get and set functions to build PcInitiatedLspRequest.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepAttribute.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepAttribute.java
index 114c6fe..c2373f0 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepAttribute.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepAttribute.java
@@ -92,12 +92,6 @@
void setMetricObjectList(LinkedList<PcepMetricObject> llMetricList);
/**
- * Prints the attributes of AttributeList.
- */
-
- void print();
-
- /**
* Builder interface with get and set functions to build PcepAttribute.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepBandwidthObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepBandwidthObject.java
index 1a1d928..58d0582 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepBandwidthObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepBandwidthObject.java
@@ -39,11 +39,6 @@
void setBandwidth(int iBandwidth);
/**
- * Prints attributes of bandwidth object.
- */
- void print();
-
- /**
* Writes the BandwidthObject into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEndPointsObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEndPointsObject.java
index a8c80a9..92d4387 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEndPointsObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEndPointsObject.java
@@ -54,11 +54,6 @@
void setDestIpAddress(int destIpAddress);
/**
- * Prints attributes of EndPoints object.
- */
- void print();
-
- /**
* Writes the EndPointsObject into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEroObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEroObject.java
index 9c49187..3af6b75 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEroObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepEroObject.java
@@ -52,11 +52,6 @@
int write(ChannelBuffer bb) throws PcepParseException;
/**
- * Prints attributes of ERO object.
- */
- void print();
-
- /**
* Builder interface with get and set functions to build ERO object.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepError.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepError.java
index 1dc8a3f..b61bfb9 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepError.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepError.java
@@ -77,11 +77,6 @@
int write(ChannelBuffer bb) throws PcepParseException;
/**
- * Prints the attributes of PCEP Error.
- */
- void print();
-
- /**
* Builder interface with get and set functions to build PcepError.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorInfo.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorInfo.java
index 5d8bfd9..0c625a0 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorInfo.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorInfo.java
@@ -50,11 +50,6 @@
void write(ChannelBuffer bb) throws PcepParseException;
/**
- * Prints the attributes of error info list.
- */
- void print();
-
- /**
* Returns Error Value in PCEP-ERROR Object.
*
* @return list of Error Value in PCEP-ERROR Object
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorMsg.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorMsg.java
old mode 100755
new mode 100644
index c785c2c..ff06885
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorMsg.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorMsg.java
@@ -1,6 +1,23 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.onosproject.pcepio.protocol;
import org.jboss.netty.buffer.ChannelBuffer;
+import org.onosproject.pcepio.exceptions.PcepParseException;
import org.onosproject.pcepio.types.ErrorObjListWithOpen;
/**
@@ -43,7 +60,7 @@
void setPcepErrorInfo(PcepErrorInfo errInfo);
@Override
- void writeTo(ChannelBuffer channelBuffer);
+ void writeTo(ChannelBuffer channelBuffer) throws PcepParseException;
/**
* Builder interface with get and set functions to build PCEP Error message.
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorObject.java
old mode 100755
new mode 100644
index 9933802..16374d5
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepErrorObject.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.onosproject.pcepio.protocol;
import java.util.LinkedList;
@@ -55,11 +70,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of Error object.
- */
- void print();
-
- /**
* Writes the Error Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java
index 5cca7e3..150de92 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactories.java
@@ -33,7 +33,7 @@
private PcepFactories() {
}
- /*
+ /**
* Returns the instance of PCEP Version.
*
* @param version PCEP version
@@ -84,7 +84,7 @@
}
}
- /*
+ /**
* Returns GENERIC_READER.
*
* @return GENERIC_READER
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactory.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactory.java
index e9eb125..1a31e0a 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactory.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFactory.java
@@ -238,4 +238,18 @@
* @return Builder Object for PcepError
*/
PcepError.Builder buildPcepError();
+
+ /**
+ * To get Builder Object for PcepLabelRangeObject.
+ *
+ * @return Builder Object for PcepLabelRangeObject
+ */
+ PcepLabelRangeObject.Builder buildPcepLabelRangeObject();
+
+ /**
+ * To get Builder Object for PcepLabelRangeResvMsg.
+ *
+ * @return Builder Object for PcepLabelRangeResvMsg
+ */
+ PcepLabelRangeResvMsg.Builder buildPcepLabelRangeResvMsg();
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObject.java
index e356470..2df7cc9 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObject.java
@@ -46,9 +46,4 @@
* @throws PcepParseException while writing FEC Object into Channel Buffer.
*/
int write(ChannelBuffer bb) throws PcepParseException;
-
- /**
- * Prints attributes of FEC object.
- */
- void print();
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4.java
index c432f2a..5ed4e1e 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4.java
@@ -40,9 +40,6 @@
void setNodeID(int value);
@Override
- void print();
-
- @Override
int write(ChannelBuffer bb) throws PcepParseException;
/**
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4Adjacency.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4Adjacency.java
index 154bda2..5520529 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4Adjacency.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4Adjacency.java
@@ -54,9 +54,6 @@
void seRemoteIPv4Address(int value);
@Override
- void print();
-
- @Override
int write(ChannelBuffer bb) throws PcepParseException;
/**
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4UnnumberedAdjacency.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4UnnumberedAdjacency.java
index e2d0e93..d240445 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4UnnumberedAdjacency.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv4UnnumberedAdjacency.java
@@ -82,9 +82,6 @@
void setRemoteInterfaceID(int value);
@Override
- void print();
-
- @Override
int write(ChannelBuffer bb) throws PcepParseException;
/**
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6.java
index b0de9e5..1c29b76 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6.java
@@ -40,9 +40,6 @@
void setNodeID(byte[] value);
@Override
- void print();
-
- @Override
int write(ChannelBuffer bb) throws PcepParseException;
/**
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6Adjacency.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6Adjacency.java
index 6216d48..ef80278 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6Adjacency.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepFecObjectIPv6Adjacency.java
@@ -54,9 +54,6 @@
void seRemoteIPv6Address(byte[] value);
@Override
- void print();
-
- @Override
int write(ChannelBuffer bb) throws PcepParseException;
/**
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepInterLayerObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepInterLayerObject.java
index a8f3df0..675e055 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepInterLayerObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepInterLayerObject.java
@@ -53,11 +53,6 @@
void setbIFlag(boolean value);
/**
- * Prints attributes of INTER Layer object.
- */
- void print();
-
- /**
* Writes the INTER Layer Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepIroObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepIroObject.java
index 154bd98..a1c1fc5 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepIroObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepIroObject.java
@@ -41,11 +41,6 @@
void setSubObjects(LinkedList<PcepValueType> llSubObjects);
/**
- * Prints attributes of IRO object.
- */
- void print();
-
- /**
* Writes the IRO into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelObject.java
index 41f19e6..b64c21e 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelObject.java
@@ -71,11 +71,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of Label object.
- */
- void print();
-
- /**
* Writes the Label Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRange.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRange.java
index 8367494..72d0a38 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRange.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRange.java
@@ -62,9 +62,4 @@
* @throws PcepParseException while writing LABEL RANGE into Channel Buffer.
*/
int write(ChannelBuffer bb) throws PcepParseException;
-
- /**
- * Prints Attributes of PcepLabelRange.
- */
- void print();
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRangeObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRangeObject.java
index 235a594..9155434 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRangeObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelRangeObject.java
@@ -82,11 +82,6 @@
int getLabelBase();
/**
- * Prints attributes of LabelRange object.
- */
- void print();
-
- /**
* Writes the LabelRange Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelUpdate.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelUpdate.java
index b16157c..a3489e6 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelUpdate.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLabelUpdate.java
@@ -62,11 +62,6 @@
PcepLabelMap getLabelMap();
/**
- * Prints the attributes of PCEP Label update.
- */
- void print();
-
- /**
* Builder interface with get and set functions to build Label Update message.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspObject.java
index bb0fac1..5d55250 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspObject.java
@@ -127,11 +127,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of LSP object.
- */
- void print();
-
- /**
* Writes the LSP Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspaObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspaObject.java
index ff74eff..d541e92 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspaObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepLspaObject.java
@@ -126,11 +126,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of LSPA object.
- */
- void print();
-
- /**
* Writes the LSPA Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMessage.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMessage.java
index d794fcd..7de0716 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMessage.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMessage.java
@@ -34,11 +34,6 @@
*/
PcepType getType();
- /**
- * Prints attributes of PCEP Messages.
- */
- void print();
-
@Override
void writeTo(ChannelBuffer channelBuffer) throws PcepParseException;
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMetricObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMetricObject.java
index 70e5bbd..380fb42 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMetricObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMetricObject.java
@@ -95,11 +95,6 @@
void setBType(byte value);
/**
- * Prints attributes of Metric object.
- */
- void print();
-
- /**
* Writes the Metric Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMsgPath.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMsgPath.java
old mode 100755
new mode 100644
index 9b2becd..3beb1dd
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMsgPath.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepMsgPath.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.onosproject.pcepio.protocol;
import org.jboss.netty.buffer.ChannelBuffer;
@@ -57,11 +72,6 @@
public int write(ChannelBuffer bb) throws PcepParseException;
/**
- * Prints the attributes of PCEP message path.
- */
- void print();
-
- /**
* Builder interface with get and set functions to build PcepMsgPath.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenMsg.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenMsg.java
old mode 100755
new mode 100644
index 1cffa91..904156f
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenMsg.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenMsg.java
@@ -45,7 +45,7 @@
PcepOpenObject getPcepOpenObject();
@Override
- void writeTo(ChannelBuffer channelBuffer);
+ void writeTo(ChannelBuffer channelBuffer) throws PcepParseException;
/**
* Builder interface with get and set functions to build Open message.
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenObject.java
index 9c3a252..13dd2fa 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepOpenObject.java
@@ -106,11 +106,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of Open object.
- */
- void print();
-
- /**
* Writes the Open into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRPObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRPObject.java
index 71cc1c4..c6993c3 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRPObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRPObject.java
@@ -112,11 +112,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of RP object.
- */
- void print();
-
- /**
* Writes the RP Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRroObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRroObject.java
index 7a7d299..928ce1a 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRroObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepRroObject.java
@@ -42,11 +42,6 @@
void setSubObjects(LinkedList<PcepValueType> llSubObjects);
/**
- * Prints attributes of RRO object.
- */
- void print();
-
- /**
* Writes the RRO Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepSrpObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepSrpObject.java
index 1d6f5be..e4816ef 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepSrpObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepSrpObject.java
@@ -71,11 +71,6 @@
LinkedList<PcepValueType> getOptionalTlv();
/**
- * Prints attributes of SRP object.
- */
- void print();
-
- /**
* Writes the SRP Object into channel buffer.
*
* @param bb channel buffer
@@ -172,6 +167,5 @@
* @return Builder by setting I flag
*/
Builder setIFlag(boolean value);
-
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepStateReport.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepStateReport.java
index 2815f4a..688440e 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepStateReport.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepStateReport.java
@@ -102,12 +102,6 @@
* @throws PcepParseException when mandatory object is not set
*/
int write(ChannelBuffer bb) throws PcepParseException;
-
- /***
- * Prints the attribute of PCEP Message Path.
- */
- void print();
-
}
/**
@@ -153,11 +147,6 @@
void setMsgPath(PcepMsgPath msgPath);
/**
- * Prints the attribute of PCEP state report.
- */
- public void print();
-
- /**
* Builder interface with get and set functions to build PcepStateReport.
*/
public interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepTEObject.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepTEObject.java
index 100cd61..21f6c71 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepTEObject.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepTEObject.java
@@ -112,11 +112,6 @@
void setOptionalTlv(LinkedList<PcepValueType> llOptionalTlv);
/**
- * Prints attributes of TE object.
- */
- void print();
-
- /**
* Writes the TE Object into channel buffer.
*
* @param bb channel buffer
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepUpdateRequest.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepUpdateRequest.java
index 120616b..8d1c89e 100755
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepUpdateRequest.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/PcepUpdateRequest.java
@@ -18,7 +18,6 @@
import org.onosproject.pcepio.exceptions.PcepParseException;
-
/**
* Abstraction of an entity providing PCEP Update Request List.
*/
@@ -67,11 +66,6 @@
void setMsgPath(PcepMsgPath msgPath);
/**
- * Prints the attributes of PCEP Update Request.
- */
- void print();
-
- /**
* Builder interface with get and set functions to build PcepUpdateRequest.
*/
interface Builder {
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
index f035914..970c197 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcInitiatedLspRequestVer1.java
@@ -276,47 +276,21 @@
this.bIsPcepAttributeSet = true;
return this;
}
-
- }
-
- @Override
- public void print() {
-
- log.debug(" PC-INITIATED LSP INITIATION REQUEST");
- srpObject.print();
- lspObject.print();
- //if PC initiate then print end point and ero object [pcepattribute].
- if (endPointsObject instanceof PcepEndPointsObject) {
- endPointsObject.print();
- }
-
- if (eroObject instanceof PcepEroObject) {
- eroObject.print();
- }
-
- if (pcepAttribute instanceof PcepAttribute) {
- pcepAttribute.print();
- }
}
@Override
public String toString() {
ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass());
- toStrHelper
- .add("SRP Object", srpObject)
- .add("LSP object", lspObject);
+ toStrHelper.add("SrpObject", srpObject).add("LspObject", lspObject);
if (endPointsObject instanceof PcepEndPointsObject) {
- toStrHelper
- .add("End Point Object", endPointsObject);
+ toStrHelper.add("EndPointObject", endPointsObject);
}
if (eroObject instanceof PcepEroObject) {
- toStrHelper
- .add("ERO Object", eroObject);
+ toStrHelper.add("EroObject", eroObject);
}
if (pcepAttribute instanceof PcepAttribute) {
- toStrHelper
- .add("Pcep Attribute", pcepAttribute);
+ toStrHelper.add("PcepAttribute", pcepAttribute);
}
return toStrHelper.toString();
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java
index e6215f9..f88e876 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepAttributeVer1.java
@@ -421,48 +421,20 @@
}
@Override
- public void print() {
-
- log.debug("ATTRIBUTE LIST");
- if (lspaObject instanceof PcepLspaObject) {
- lspaObject.print();
- }
-
- if (bandwidthObject instanceof PcepBandwidthObject) {
- bandwidthObject.print();
- }
-
- if (llMetricList != null) {
- log.debug("METRIC LIST");
- ListIterator<PcepMetricObject> listIterator = llMetricList.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
- if (iroObject instanceof PcepIroObject) {
- iroObject.print();
- }
- }
-
- @Override
public String toString() {
ToStringHelper toStrHelper = MoreObjects.toStringHelper(getClass());
if (lspaObject instanceof PcepLspaObject) {
- toStrHelper
- .add("PCEP lspa Object", lspaObject);
+ toStrHelper.add("lspaObject", lspaObject);
}
if (bandwidthObject instanceof PcepBandwidthObject) {
- toStrHelper
- .add("bandwidth Object", bandwidthObject);
+ toStrHelper.add("bandwidthObject", bandwidthObject);
}
if (llMetricList instanceof PcepMetricObject) {
- toStrHelper
- .add("Pcep Metric object List", llMetricList);
+ toStrHelper.add("MetricObjectList", llMetricList);
}
if (iroObject instanceof PcepIroObject) {
- toStrHelper
- .add("iro Object", iroObject);
+ toStrHelper.add("IroObject", iroObject);
}
return toStrHelper.toString();
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java
index f46ff72..ac34444 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepBandwidthObjectVer1.java
@@ -225,18 +225,8 @@
}
@Override
- public void print() {
-
- log.debug("BANDWIDTH OBJECT");
- bandwidthObjHeader.print();
- log.debug("Bandwidth: " + iBandwidth);
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("bandwidth Object Header", bandwidthObjHeader)
- .add("Bandwidth", iBandwidth)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("BandwidthObjectHeader", bandwidthObjHeader)
+ .add("Bandwidth", iBandwidth).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java
index 54ed78f..040a014 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepCloseMsgVer1.java
@@ -157,7 +157,7 @@
private PcepObjectHeader closeObjHeader;
private boolean bIsReasonSet = false;
private byte yReason;
- LinkedList<PcepValueType> llOptionalTlv = new LinkedList<PcepValueType>();
+ private LinkedList<PcepValueType> llOptionalTlv = new LinkedList<PcepValueType>();
private boolean bIsPFlagSet = false;
private boolean bPFlag;
@@ -333,24 +333,8 @@
}
@Override
- public void print() {
- log.debug("CLOSE MESSAGE");
- closeObjHeader.print();
- int x = yReason & 0xFF;
- log.debug("Reason: " + x);
- log.debug("OPTINAL TLV:");
- ListIterator<PcepValueType> listIterator = llOptionalTlv.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("close Object Header", closeObjHeader)
- .add("Reason", yReason)
- .add("Optional Tlv list", llOptionalTlv)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("closeObjectHeader", closeObjHeader).add("Reason", yReason)
+ .add("OptionalTlvlist", llOptionalTlv).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java
index d57d35b..cce278e 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEndPointsObjectVer1.java
@@ -241,28 +241,12 @@
this.bIsIFlagSet = true;
return this;
}
-
- }
-
- @Override
- public void print() {
-
- log.debug("ENDPOINT OBJECT");
- long lTemp;
- lTemp = sourceIpAddress & 0xFFFFFFFF;
- String str = "Source IP Address: " + lTemp;
- log.debug(str);
- lTemp = destIpAddress & 0xFFFFFFFF;
- str = "destination IP Address: " + lTemp;
- log.debug(str);
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("sourceIpAddress", sourceIpAddress)
- .add("destIpAddress", destIpAddress)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("sourceIpAddress", sourceIpAddress)
+ .add("destIpAddress", destIpAddress).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java
index 586547e..b45a0c2 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepEroObjectVer1.java
@@ -393,26 +393,11 @@
this.bIsIFlagSet = true;
return this;
}
-
- }
-
- @Override
- public void print() {
-
- log.debug("ERO OBJECT");
- eroObjHeader.print();
- log.debug("SUBOBJECTS:");
- ListIterator<PcepValueType> listIterator = llSubObjects.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("ero obj Header", eroObjHeader)
- .add("Sub-Objects", llSubObjects)
+ return MoreObjects.toStringHelper(getClass()).add("EroObjHeader", eroObjHeader).add("SubObjects", llSubObjects)
.toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFactoryVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFactoryVer1.java
index 6f4b2b2..4d50c70 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFactoryVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepFactoryVer1.java
@@ -31,7 +31,6 @@
import org.onosproject.pcepio.protocol.PcepMessageReader;
import org.onosproject.pcepio.protocol.PcepMetricObject;
import org.onosproject.pcepio.protocol.PcepMsgPath;
-
import org.onosproject.pcepio.protocol.PcepSrpObject;
import org.onosproject.pcepio.protocol.PcepUpdateMsg;
import org.onosproject.pcepio.protocol.PcepUpdateRequest;
@@ -210,4 +209,16 @@
return null;
}
+ @Override
+ public org.onosproject.pcepio.protocol.PcepLabelRangeObject.Builder buildPcepLabelRangeObject() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public org.onosproject.pcepio.protocol.PcepLabelRangeResvMsg.Builder buildPcepLabelRangeResvMsg() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
index 7392370..c571d25 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepInitiateMsgVer1.java
@@ -316,19 +316,8 @@
}
@Override
- public void print() {
-
- log.debug("PCEP INITIATE MESSAGE");
- ListIterator<PcInitiatedLspRequest> listIterator = llPcInitiatedLspRequestList.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("PC initiaited lsp request list", llPcInitiatedLspRequestList)
+ return MoreObjects.toStringHelper(getClass()).add("PcInitiaitedLspRequestList", llPcInitiatedLspRequestList)
.toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java
index cd9f906..d8c7b19 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepIroObjectVer1.java
@@ -282,25 +282,11 @@
this.bIsIFlagSet = true;
return this;
}
-
- }
-
- @Override
- public void print() {
- log.debug("IRO OBJECT");
- iroObjHeader.print();
- log.debug("SUBOBJECTS:");
- ListIterator<PcepValueType> listIterator = llSubObjects.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("IRO object header", iroObjHeader)
- .add("List of sub object", llSubObjects)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("IroObjectHeader", iroObjHeader)
+ .add("SubObjects", llSubObjects).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java
index f0ff5cf..404f5b8 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepKeepaliveMsgVer1.java
@@ -26,6 +26,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.MoreObjects;
+
class PcepKeepaliveMsgVer1 implements PcepKeepaliveMsg {
/*
@@ -134,7 +136,7 @@
}
@Override
- public void print() {
- log.debug("KEEPALIVE MESSAGE");
+ public String toString() {
+ return MoreObjects.toStringHelper(getClass()).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java
index 137e81a..3a16318 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspObjectVer1.java
@@ -555,39 +555,9 @@
}
@Override
- public void print() {
-
- log.debug("LSP OBJECT");
- long lTemp = iPlspId & 0xFFFFFFFF;
- log.debug("PLSP Id: " + lTemp);
- lTemp = yOFlag & 0xFFFF;
- log.debug("O Flag: " + lTemp);
- lTemp = (bAFlag) ? 1 : 0;
- log.debug("A Flag: " + lTemp);
- lTemp = (bRFlag) ? 1 : 0;
- log.debug("R Flag: " + lTemp);
- lTemp = (bSFlag) ? 1 : 0;
- log.debug("S Flag: " + lTemp);
- lTemp = (bDFlag) ? 1 : 0;
- log.debug("D Flag: " + lTemp);
-
- log.debug("OPTIONAL TLV:");
- ListIterator<PcepValueType> listIterator = llOptionalTlv.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("Plsp ID value", iPlspId)
- .add("o flag", yOFlag)
- .add("A flag", bAFlag)
- .add("R flag", bRFlag)
- .add("S flag", bSFlag)
- .add("D flag", bDFlag)
- .add("List of optional tlv", llOptionalTlv)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("PlspIDValue", iPlspId).add("OFlag", yOFlag)
+ .add("AFlag", bAFlag).add("RFlag", bRFlag).add("SFlag", bSFlag).add("DFlag", bDFlag)
+ .add("OptionalTlvList", llOptionalTlv).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java
index 4db1f9e..0bec884 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepLspaObjectVer1.java
@@ -514,39 +514,9 @@
}
@Override
- public void print() {
- log.debug("LSPA OBJECT");
- long lTemp = flags & 0xFF;
- lTemp = (bLFlag) ? 1 : 0;
- log.debug("l Flag: " + lTemp);
- lTemp = cSetupPriority & 0xFF;
- log.debug("SetupPriority: " + lTemp);
- lTemp = cHoldPriority & 0xFF;
- log.debug("HoldPriority: " + lTemp);
- lTemp = iIncludeAll & 0xFFFFFFFF;
- log.debug("IncludeAll: " + lTemp);
- lTemp = iIncludeAny & 0xFFFFFFFF;
- log.debug("IncludeAny: " + lTemp);
- lTemp = iExcludeAny & 0xFFFFFFFF;
- log.debug("iExcludeAny: " + lTemp);
-
- log.debug("OPTIONAL TLV:");
- ListIterator<PcepValueType> listIterator = llOptionalTlv.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("L flag", bLFlag)
- .add("Setup priority", cSetupPriority)
- .add("hold priority", cHoldPriority)
- .add("Include all", iIncludeAll)
- .add("Include any", iIncludeAny)
- .add("Exclude any", iExcludeAny)
- .add("List of optional tlv", llOptionalTlv)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("LFlag", bLFlag).add("SetupPriority", cSetupPriority)
+ .add("HoldPriority", cHoldPriority).add("IncludeAll", iIncludeAll).add("IncludeAny", iIncludeAny)
+ .add("ExcludeAny", iExcludeAny).add("OptionalTlvList", llOptionalTlv).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java
index c6c081a..7f946c7 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMetricObjectVer1.java
@@ -362,26 +362,8 @@
}
@Override
- public void print() {
-
- log.debug("METRIC OBJECT");
- long lTemp = iMetricVal & 0xFFFFFFFF;
- log.debug("iMetricVal: " + lTemp);
- lTemp = (bBFlag) ? 1 : 0;
- log.debug("B Flag: " + lTemp);
- lTemp = (bCFlag) ? 1 : 0;
- log.debug("C Flag: " + lTemp);
- lTemp = bType & 0xFF;
- log.debug("Type: " + lTemp);
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("Metric value", iMetricVal)
- .add("B flag", bBFlag)
- .add("C flag", bCFlag)
- .add("B-type", bType)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("MetricValue", iMetricVal).add("BFlag", bBFlag)
+ .add("CFlag", bCFlag).add("BType", bType).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java
index 5334b5f..c04cc81 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepMsgPathVer1.java
@@ -163,18 +163,8 @@
}
@Override
- public void print() {
-
- log.debug("PcepMsgPath");
- eroObj.print();
- attrList.print();
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("ERO object", eroObj)
- .add("Attribute list", attrList)
+ return MoreObjects.toStringHelper(getClass()).add("EroObject", eroObj).add("AttributeList", attrList)
.toString();
}
}
\ No newline at end of file
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java
index 58aac18..5095e71 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepSrpObjectVer1.java
@@ -379,25 +379,8 @@
}
@Override
- public void print() {
-
- log.debug("SRP OBJECT");
- long lTemp = (bRFlag) ? 1 : 0;
- log.debug("r Flag: " + lTemp);
- log.debug("SrpID: " + srpId);
-
- log.debug("OPTIONAL TLV");
- ListIterator<PcepValueType> listIterator = llOptionalTlv.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("R flag", bRFlag)
- .add("SRP ID", srpId)
- .add("Optional tlv list", llOptionalTlv)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("RFlag", bRFlag).add("SRPID", srpId)
+ .add("OptionalTlvList", llOptionalTlv).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java
index 3a4e2bd..b2ace4f 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateMsgVer1.java
@@ -290,19 +290,7 @@
}
@Override
- public void print() {
-
- log.debug("PCEP UPDATE MESSAGE");
- ListIterator<PcepUpdateRequest> listIterator = llUpdateRequestList.listIterator();
- while (listIterator.hasNext()) {
- listIterator.next().print();
- }
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("Update Request list", llUpdateRequestList)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("UpdateRequestList", llUpdateRequestList).toString();
}
}
diff --git a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java
index 71b98dd..7993694 100644
--- a/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java
+++ b/pcep/pcepio/src/main/java/org/onosproject/pcepio/protocol/ver1/PcepUpdateRequestVer1.java
@@ -189,19 +189,8 @@
}
@Override
- public void print() {
-
- log.debug("UPDATE REQUEST");
- srpObject.print();
- lspObject.print();
- }
-
- @Override
public String toString() {
- return MoreObjects.toStringHelper(getClass())
- .add("SRP Object", srpObject)
- .add("LSP object", lspObject)
- .add("message path object", msgPath)
- .toString();
+ return MoreObjects.toStringHelper(getClass()).add("SrpObject", srpObject).add("LspObject", lspObject)
+ .add("MsgPath", msgPath).toString();
}
}
\ No newline at end of file