Revert "[ONOS-5187] Compute path with Explicit path objects"
This reverts commit a32f6da9cea107b5a2c8d95c2566e1f1af1a7cce.
Change-Id: Ic023d701d18f0ae7af2579bc43777714a0e701dc
diff --git a/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/PcePathInfo.java b/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/PcePathInfo.java
index 6497e36..3b7b47e 100644
--- a/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/PcePathInfo.java
+++ b/apps/pce/app/src/main/java/org/onosproject/pce/pcestore/PcePathInfo.java
@@ -22,7 +22,6 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.intent.Constraint;
-import org.onosproject.pce.pceservice.ExplicitPathInfo;
import org.onosproject.pce.pceservice.LspType;
/**
@@ -41,8 +40,6 @@
private LspType lspType; // lsp type
- private List<ExplicitPathInfo> explicitPathInfo; //Explicit path info to compute explicit path
-
/**
* Initialization of member variables.
*
@@ -51,20 +48,17 @@
* @param name tunnel name
* @param constraints list of constraints
* @param lspType lsp type
- * @param explicitPathInfo explicit path info
*/
public PcePathInfo(DeviceId src,
DeviceId dst,
String name,
List<Constraint> constraints,
- LspType lspType,
- List<ExplicitPathInfo> explicitPathInfo) {
+ LspType lspType) {
this.src = src;
this.dst = dst;
this.name = name;
this.constraints = constraints;
this.lspType = lspType;
- this.explicitPathInfo = explicitPathInfo;
}
/**
@@ -76,7 +70,6 @@
this.name = null;
this.constraints = null;
this.lspType = null;
- this.explicitPathInfo = null;
}
/**
@@ -169,27 +162,9 @@
this.lspType = lspType;
}
- /**
- * Returns list of explicit path info.
- *
- * @return list of explicit path info
- */
- public List<ExplicitPathInfo> explicitPathInfo() {
- return explicitPathInfo;
- }
-
- /**
- * Sets list of explicit path info.
- *
- * @param explicitPathInfo list of explicit path info
- */
- public void explicitPathInfo(List<ExplicitPathInfo> explicitPathInfo) {
- this.explicitPathInfo = explicitPathInfo;
- }
-
@Override
public int hashCode() {
- return Objects.hash(src, dst, name, constraints, lspType, explicitPathInfo);
+ return Objects.hash(src, dst, name, constraints, lspType);
}
@Override
@@ -203,8 +178,7 @@
Objects.equals(this.dst, other.dst) &&
Objects.equals(this.name, other.name) &&
Objects.equals(this.constraints, other.constraints) &&
- Objects.equals(this.lspType, other.lspType) &&
- Objects.equals(this.explicitPathInfo, other.explicitPathInfo);
+ Objects.equals(this.lspType, other.lspType);
}
return false;
}
@@ -213,12 +187,11 @@
public String toString() {
return MoreObjects.toStringHelper(getClass())
.omitNullValues()
- .add("Source", src)
- .add("Destination", dst)
- .add("Name", name)
- .add("Constraints", constraints)
- .add("explicitPathInfo", explicitPathInfo)
- .add("LspType", lspType)
+ .add("Source", src.toString())
+ .add("Destination", dst.toString())
+ .add("Name", name.toString())
+ .add("Constraints", constraints.toString())
+ .add("LspType", lspType.toString())
.toString();
}
}