Remove dependency on LinkResourceService from Constraint
Change-Id: Ib9c488331b22eef6769a767c6186ef7d2e8b1501
diff --git a/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java b/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
index b644692..9cff6fd 100644
--- a/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
+++ b/core/api/src/main/java/org/onosproject/net/intent/constraint/BooleanConstraint.java
@@ -19,7 +19,7 @@
import org.onosproject.net.Link;
import org.onosproject.net.Path;
import org.onosproject.net.intent.Constraint;
-import org.onosproject.net.resource.link.LinkResourceService;
+import org.onosproject.net.intent.ResourceContext;
/**
* Abstract base class for various constraints that evaluate link viability
@@ -32,10 +32,10 @@
* Returns true if the specified link satisfies the constraint.
*
* @param link link to be validated
- * @param resourceService resource service for checking available link resources
+ * @param context resource context for checking available resources
* @return true if link is viable
*/
- public abstract boolean isValid(Link link, LinkResourceService resourceService);
+ public abstract boolean isValid(Link link, ResourceContext context);
/**
* {@inheritDoc}
@@ -43,18 +43,18 @@
* Negative return value means the specified link does not satisfy this constraint.
*
* @param link {@inheritDoc}
- * @param resourceService {@inheritDoc}
+ * @param context {@inheritDoc}
* @return {@inheritDoc}
*/
@Override
- public double cost(Link link, LinkResourceService resourceService) {
- return isValid(link, resourceService) ? +1 : -1;
+ public double cost(Link link, ResourceContext context) {
+ return isValid(link, context) ? +1 : -1;
}
@Override
- public boolean validate(Path path, LinkResourceService resourceService) {
+ public boolean validate(Path path, ResourceContext context) {
return path.links().stream()
- .allMatch(link -> isValid(link, resourceService));
+ .allMatch(link -> isValid(link, context));
}
}