EdgeManager fixes
- Edge point update should be triggered based on TopologyEvent.
{Device, Link}Event can be triggered before TopologyEvent,
which will result in use of the outdated Topology to determine
if the port is an edge port leading to incorrect edge port set.
(ONOS-4896)
- Ports on Edge Link should not be considered part of infrastructure,
should be candidate for Edge point.
Change-Id: I7d69cc242ba7849996c1105ccd1956975db63480
diff --git a/core/common/src/main/java/org/onosproject/common/DefaultTopology.java b/core/common/src/main/java/org/onosproject/common/DefaultTopology.java
index a2bc4a5..8c4fbc8 100644
--- a/core/common/src/main/java/org/onosproject/common/DefaultTopology.java
+++ b/core/common/src/main/java/org/onosproject/common/DefaultTopology.java
@@ -37,6 +37,7 @@
import org.onosproject.net.DeviceId;
import org.onosproject.net.DisjointPath;
import org.onosproject.net.Link;
+import org.onosproject.net.Link.Type;
import org.onosproject.net.Path;
import org.onosproject.net.provider.ProviderId;
import org.onosproject.net.topology.ClusterId;
@@ -442,14 +443,17 @@
riskProfile2.put(new TopologyEdge() {
Link cur = l;
+ @Override
public Link link() {
return cur;
}
+ @Override
public TopologyVertex src() {
return () -> src;
}
+ @Override
public TopologyVertex dst() {
return () -> dst;
}
@@ -568,6 +572,12 @@
private ImmutableSet<ConnectPoint> findInfrastructurePoints() {
ImmutableSet.Builder<ConnectPoint> builder = ImmutableSet.builder();
for (TopologyEdge edge : graph.getEdges()) {
+ if (edge.link().type() == Type.EDGE) {
+ // exclude EDGE link from infrastructure link
+ // - Device <-> Host
+ // - Device <-> remote domain Device
+ continue;
+ }
builder.add(edge.link().src());
builder.add(edge.link().dst());
}