Some class of constraints should not be used for link cost evaluation.
ONOS-6021
Current ConnectivityIntentCompiler simply picks first non-negative cost as Link cost value.
Some class of constraints are used to express Path viability or IntentCompiler's behavior.
Those constraints tend to returns fixed arbitrary non-negative link cost, which probably is not the best option to be used as Link cost during path computation.
This patch will:
- Introduce base class for constraints which should not influence Link cost.
- Introduce base class for constraints which should not influence Link cost or Path viability.
- Exclude above classes from link cost computation in ConnectivityIntentCompiler
MarkerConstraint
base class for Constraints,
which is not meant to influence Link cost or Path viability.
PathViablityConstraint
base class for Constraints,
which is not meant to influence Link cost.
Change-Id: Ice8b83a18cfe3bf5a68c25a853667bfaedb2b1a1
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
index c768820..a0e78ef 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/WaypointConstraint.java
@@ -21,7 +21,6 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.Link;
import org.onosproject.net.Path;
-import org.onosproject.net.intent.Constraint;
import org.onosproject.net.intent.ResourceContext;
import java.util.Collections;
@@ -36,7 +35,7 @@
* Constraint that evaluates elements passed through in order.
*/
@Beta
-public class WaypointConstraint implements Constraint {
+public final class WaypointConstraint extends PathViabilityConstraint {
private final List<DeviceId> waypoints;
@@ -62,13 +61,6 @@
// doesn't use LinkResourceService
@Override
- public double cost(Link link, ResourceContext context) {
- // Always consider the number of hops
- return 1;
- }
-
- // doesn't use LinkResourceService
- @Override
public boolean validate(Path path, ResourceContext context) {
// explicitly call a method not depending on LinkResourceService
return validate(path);