diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java index 97c5695404..4e9fc9a146 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java @@ -52,7 +52,7 @@ public abstract class BooleanConstraint implements Constraint { @Override public boolean validate(Path path, LinkResourceService resourceService) { for (Link link : path.links()) { - if (isValid(link, resourceService)) { + if (!isValid(link, resourceService)) { return false; } } diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java index 3ed3fae1e3..6d73fc2a11 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java @@ -19,7 +19,6 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; import org.onlab.onos.net.DeviceId; import org.onlab.onos.net.Link; -import org.onlab.onos.net.Path; import org.onlab.onos.net.resource.LinkResourceService; import java.util.Objects; @@ -48,17 +47,6 @@ public class ObstacleConstraint extends BooleanConstraint { return !(obstacles.contains(src) || obstacles.contains(dst)); } - @Override - public boolean validate(Path path, LinkResourceService resourceService) { - for (Link link : path.links()) { - if (!isValid(link, resourceService)) { - return false; - } - } - - return true; - } - @Override public int hashCode() { return Objects.hash(obstacles);