mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-04 02:01:11 +01:00
Code Issues Projects Releases Wiki Activity

Merge "Fix bug in validate() in BooleanConstraint"

Browse Source
This commit is contained in:
Thomas Vachuska 2014-11-10 20:03:27 -08:00 committed by Gerrit Code Review
commit 361bc539ea
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/src/main/java/org/onlab/onos/net/intent/constraint/BooleanConstraint.java
View File

@ -52,7 +52,7 @@ public abstract class BooleanConstraint implements Constraint {
@Override @Override
public boolean validate(Path path, LinkResourceService resourceService) { public boolean validate(Path path, LinkResourceService resourceService) {
for (Link link : path.links()) { for (Link link : path.links()) {
if (isValid(link, resourceService)) { if (!isValid(link, resourceService)) {
return false; return false;
} }
} }

12
core/api/src/main/java/org/onlab/onos/net/intent/constraint/ObstacleConstraint.java
View File

@ -19,7 +19,6 @@ import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import org.onlab.onos.net.DeviceId; import org.onlab.onos.net.DeviceId;
import org.onlab.onos.net.Link; import org.onlab.onos.net.Link;
import org.onlab.onos.net.Path;
import org.onlab.onos.net.resource.LinkResourceService; import org.onlab.onos.net.resource.LinkResourceService;
import java.util.Objects; import java.util.Objects;
@ -48,17 +47,6 @@ public class ObstacleConstraint extends BooleanConstraint {
return !(obstacles.contains(src) || obstacles.contains(dst)); 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 @Override
public int hashCode() { public int hashCode() {
return Objects.hash(obstacles); return Objects.hash(obstacles);