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

Merge "Use DeviceId instead of ElementId in WaypointConstraint for consistency"

Browse Source
This commit is contained in:
Thomas Vachuska 2014-11-11 14:58:12 -08:00 committed by Gerrit Code Review
commit 23aa49fb9e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ package org.onlab.onos.net.intent.constraint;
import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.onlab.onos.net.ElementId; 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.Path;
import org.onlab.onos.net.intent.Constraint; import org.onlab.onos.net.intent.Constraint;
@ -35,20 +35,20 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/ */
public class WaypointConstraint implements Constraint { public class WaypointConstraint implements Constraint {
private final List<ElementId> waypoints; private final List<DeviceId> waypoints;
/** /**
* Creates a new waypoint constraint. * Creates a new waypoint constraint.
* *
* @param waypoints waypoints * @param waypoints waypoints
*/ */
public WaypointConstraint(ElementId... waypoints) { public WaypointConstraint(DeviceId... waypoints) {
checkNotNull(waypoints, "waypoints cannot be null"); checkNotNull(waypoints, "waypoints cannot be null");
checkArgument(waypoints.length > 0, "length of waypoints should be more than 0"); checkArgument(waypoints.length > 0, "length of waypoints should be more than 0");
this.waypoints = ImmutableList.copyOf(waypoints); this.waypoints = ImmutableList.copyOf(waypoints);
} }
public List<ElementId> waypoints() { public List<DeviceId> waypoints() {
return waypoints; return waypoints;
} }
@ -60,8 +60,8 @@ public class WaypointConstraint implements Constraint {
@Override @Override
public boolean validate(Path path, LinkResourceService resourceService) { public boolean validate(Path path, LinkResourceService resourceService) {
LinkedList<ElementId> waypoints = new LinkedList<>(this.waypoints); LinkedList<DeviceId> waypoints = new LinkedList<>(this.waypoints);
ElementId current = waypoints.poll(); DeviceId current = waypoints.poll();
// This is safe because Path class ensures the number of links are more than 0 // This is safe because Path class ensures the number of links are more than 0
Link firstLink = path.links().get(0); Link firstLink = path.links().get(0);
if (firstLink.src().elementId().equals(current)) { if (firstLink.src().elementId().equals(current)) {