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

Modified the MultiPointToSinglePointIntentCompiler to prevent duplicate packets

Browse Source 
Change-Id: Ifb7609be04ed8a0330b7a0b47420ca33af0656c6
This commit is contained in:
Jonathan Hart 2014-12-01 20:45:18 -08:00
parent 5cd352d057
commit f5e3580f8d
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/net/src/main/java/org/onlab/onos/net/intent/impl/MultiPointToSinglePointIntentCompiler.java
View File

@ -15,12 +15,19 @@
*/ */
package org.onlab.onos.net.intent.impl; package org.onlab.onos.net.intent.impl;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference; import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality; import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.onlab.onos.net.ConnectPoint; import org.onlab.onos.net.ConnectPoint;
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.Intent; import org.onlab.onos.net.intent.Intent;
@ -32,10 +39,7 @@ import org.onlab.onos.net.intent.PointToPointIntent;
import org.onlab.onos.net.resource.LinkResourceAllocations; import org.onlab.onos.net.resource.LinkResourceAllocations;
import org.onlab.onos.net.topology.PathService; import org.onlab.onos.net.topology.PathService;
import java.util.Arrays; import com.google.common.collect.Sets;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/** /**
* An intent compiler for * An intent compiler for
@ -64,16 +68,25 @@ public class MultiPointToSinglePointIntentCompiler
@Override @Override
public List<Intent> compile(MultiPointToSinglePointIntent intent, List<Intent> installable, public List<Intent> compile(MultiPointToSinglePointIntent intent, List<Intent> installable,
Set<LinkResourceAllocations> resources) { Set<LinkResourceAllocations> resources) {
Set<Link> links = new HashSet<>(); Map<DeviceId, Link> links = new HashMap<>();
for (ConnectPoint ingressPoint : intent.ingressPoints()) { for (ConnectPoint ingressPoint : intent.ingressPoints()) {
Path path = getPath(ingressPoint, intent.egressPoint()); Path path = getPath(ingressPoint, intent.egressPoint());
links.addAll(path.links()); for (Link link : path.links()) {
if (links.containsKey(link.src().deviceId())) {
// We've already reached the existing tree with the first
// part of this path. Don't add the remainder of the path
// in case it differs from the path we already have.
break;
}
links.put(link.src().deviceId(), link);
}
} }
Intent result = new LinkCollectionIntent(intent.appId(), Intent result = new LinkCollectionIntent(intent.appId(),
intent.selector(), intent.treatment(), intent.selector(), intent.treatment(),
links, intent.egressPoint()); Sets.newHashSet(links.values()), intent.egressPoint());
return Arrays.asList(result); return Arrays.asList(result);
} }