[ONOS-4167] Identify the impacted tunnels based on network events, reilency with UT
Change-Id: I2bae0b789a22b8a6854f4e12b692d03cd6f7415d
diff --git a/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java b/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java
index 904371d..11cc18e 100644
--- a/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java
+++ b/apps/pce/app/src/main/java/org/onosproject/pce/pceservice/PceManager.java
@@ -52,6 +52,7 @@
import org.onosproject.incubator.net.tunnel.TunnelListener;
import org.onosproject.incubator.net.tunnel.TunnelName;
import org.onosproject.incubator.net.tunnel.TunnelService;
+import org.onosproject.mastership.MastershipService;
import org.onosproject.net.DefaultAnnotations;
import org.onosproject.net.DefaultAnnotations.Builder;
import org.onosproject.net.Device;
@@ -63,6 +64,7 @@
import org.onosproject.net.flowobjective.Objective;
import org.onosproject.net.intent.Constraint;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
+import org.onosproject.net.link.LinkEvent;
import org.onosproject.pce.pceservice.constraint.CapabilityConstraint;
import org.onosproject.pce.pceservice.constraint.CapabilityConstraint.CapabilityType;
import org.onosproject.pce.pceservice.constraint.CostConstraint;
@@ -76,6 +78,9 @@
import org.onosproject.net.topology.LinkWeight;
import org.onosproject.net.topology.PathService;
import org.onosproject.net.topology.TopologyEdge;
+import org.onosproject.net.topology.TopologyEvent;
+import org.onosproject.net.topology.TopologyListener;
+import org.onosproject.net.topology.TopologyService;
import org.onosproject.pce.pceservice.api.PceService;
import org.onosproject.pce.pcestore.PcePathInfo;
import org.onosproject.pce.pcestore.PceccTunnelInfo;
@@ -171,12 +176,19 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected FlowObjectiveService flowObjectiveService;
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected MastershipService mastershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected TopologyService topologyService;
+
private TunnelListener listener = new InnerTunnelListener();
private BasicPceccHandler crHandler;
private PceccSrTeBeHandler srTeHandler;
private ApplicationId appId;
private final PcepPacketProcessor processor = new PcepPacketProcessor();
+ private final TopologyListener topologyListener = new InternalTopologyListener();
/**
* Creates new instance of PceManager.
@@ -204,6 +216,7 @@
.asDistributedSet();
packetService.addProcessor(processor, PacketProcessor.director(4));
+ topologyService.addListener(topologyListener);
log.info("Started");
}
@@ -211,6 +224,7 @@
protected void deactivate() {
tunnelService.removeListener(listener);
packetService.removeProcessor(processor);
+ topologyService.removeListener(topologyListener);
log.info("Stopped");
}
@@ -395,6 +409,7 @@
List<Link> links = tunnel.path().links();
String lspSigType = tunnel.annotations().value(LSP_SIG_TYPE);
double bwConstraintValue = 0;
+ String costType = null;
SharedBandwidthConstraint shBwConstraint = null;
BandwidthConstraint bwConstraint = null;
CostConstraint costConstraint = null;
@@ -409,6 +424,7 @@
bwConstraintValue = bwConstraint.bandwidth().bps();
} else if (constraint instanceof CostConstraint) {
costConstraint = (CostConstraint) constraint;
+ costType = costConstraint.type().name();
}
}
@@ -454,6 +470,9 @@
Builder annotationBuilder = DefaultAnnotations.builder();
annotationBuilder.set(BANDWIDTH, String.valueOf(bwConstraintValue));
+ if (costType != null) {
+ annotationBuilder.set(COST_TYPE, costType);
+ }
annotationBuilder.set(LSP_SIG_TYPE, lspSigType);
annotationBuilder.set(PCE_INIT, TRUE);
annotationBuilder.set(DELEGATE, TRUE);
@@ -594,8 +613,61 @@
}
}
+ //TODO: annotations used for temporarily later projection/network config will be used
+ private class InternalTopologyListener implements TopologyListener {
+ @Override
+ public void event(TopologyEvent event) {
+ event.reasons().forEach(e -> {
+ //If event type is link removed, get the impacted tunnel
+ if (e instanceof LinkEvent) {
+ LinkEvent linkEvent = (LinkEvent) e;
+ if (linkEvent.type() == LinkEvent.Type.LINK_REMOVED) {
+ tunnelService.queryTunnel(MPLS).forEach(t -> {
+ if (t.path().links().contains(((Link) e.subject()))) {
+ // Check whether this ONOS instance is master for ingress device if yes,
+ // recompute and send update
+ checkForMasterAndUpdateTunnel(t.path().src().deviceId(), t);
+ }
+ });
+ }
+ }
+ });
+ }
+ }
- // Allocates the bandwidth locally for PCECC tunnels.
+ private boolean checkForMasterAndUpdateTunnel(DeviceId src, Tunnel tunnel) {
+ /**
+ * Master of ingress node will recompute and also delegation flag must be set.
+ */
+ if (mastershipService.isLocalMaster(src)
+ && Boolean.valueOf(tunnel.annotations().value(DELEGATE)) != null) {
+ LinkedList<Constraint> constraintList = new LinkedList<>();
+
+ if (tunnel.annotations().value(BANDWIDTH) != null) {
+ //Requested bandwidth will be same as previous allocated bandwidth for the tunnel
+ BandwidthConstraint localConst = new BandwidthConstraint(Bandwidth.bps(Double.parseDouble(tunnel
+ .annotations().value(BANDWIDTH))));
+ constraintList.add(localConst);
+ }
+ if (tunnel.annotations().value(COST_TYPE) != null) {
+ constraintList.add(CostConstraint.of(CostConstraint.Type.valueOf(tunnel.annotations().value(
+ COST_TYPE))));
+ }
+ if (!updatePath(tunnel.tunnelId(), constraintList)) {
+ // If updation fails store in PCE store as failed path
+ // then PCInitiate (Remove)
+ pceStore.addFailedPathInfo(new PcePathInfo(tunnel.path().src().deviceId(), tunnel
+ .path().dst().deviceId(), tunnel.tunnelName().value(), constraintList,
+ LspType.valueOf(tunnel.annotations().value(LSP_SIG_TYPE))));
+ //Release that tunnel calling PCInitiate
+ releasePath(tunnel.tunnelId());
+ }
+ }
+
+ return false;
+ }
+
+ // Allocates the bandwidth locally for PCECC tunnels.
private TunnelConsumerId reserveBandwidth(Path computedPath, double bandwidthConstraint,
SharedBandwidthConstraint shBwConstraint) {
checkNotNull(computedPath);
diff --git a/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/PceManagerTest.java b/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/PceManagerTest.java
index b022d9a..dee7218 100644
--- a/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/PceManagerTest.java
+++ b/apps/pce/app/src/test/java/org/onosproject/pce/pceservice/PceManagerTest.java
@@ -15,10 +15,15 @@
import static org.onosproject.pce.pceservice.PathComputationTest.D2;
import static org.onosproject.pce.pceservice.PathComputationTest.D3;
import static org.onosproject.pce.pceservice.PathComputationTest.D4;
+import static org.onosproject.pce.pceservice.PathComputationTest.DEVICE1;
+import static org.onosproject.pce.pceservice.PathComputationTest.DEVICE2;
+import static org.onosproject.pce.pceservice.PathComputationTest.DEVICE3;
+import static org.onosproject.pce.pceservice.PathComputationTest.DEVICE4;
import static org.onosproject.pce.pceservice.PcepAnnotationKeys.LOCAL_LSP_ID;
import static org.onosproject.pce.pceservice.PcepAnnotationKeys.PLSP_ID;
import static org.onosproject.incubator.net.tunnel.Tunnel.State.UNSTABLE;
import static org.onosproject.incubator.net.tunnel.Tunnel.State.ESTABLISHED;
+import static org.onosproject.net.MastershipRole.MASTER;
import java.net.URISyntaxException;
import java.nio.ByteBuffer;
@@ -35,6 +40,8 @@
import org.junit.Before;
import org.junit.Test;
import org.onlab.graph.GraphPathSearch;
+import org.onlab.junit.TestUtils;
+import org.onlab.junit.TestUtils.TestUtilsException;
import org.onlab.packet.Ethernet;
import org.onlab.packet.IPv4;
import org.onlab.util.Bandwidth;
@@ -43,6 +50,7 @@
import org.onosproject.core.CoreServiceAdapter;
import org.onosproject.core.DefaultApplicationId;
import org.onosproject.core.IdGenerator;
+import org.onosproject.event.Event;
import org.onosproject.incubator.net.resource.label.LabelResourceId;
import org.onosproject.incubator.net.resource.label.LabelResourceService;
import org.onosproject.incubator.net.tunnel.DefaultTunnel;
@@ -52,6 +60,7 @@
import org.onosproject.incubator.net.tunnel.TunnelEvent;
import org.onosproject.incubator.net.tunnel.TunnelId;
import org.onosproject.incubator.net.tunnel.TunnelListener;
+import org.onosproject.mastership.MastershipServiceAdapter;
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.Annotations;
import org.onosproject.net.ConnectPoint;
@@ -60,6 +69,7 @@
import org.onosproject.net.DefaultLink;
import org.onosproject.net.Device;
import org.onosproject.net.DefaultAnnotations.Builder;
+import org.onosproject.net.MastershipRole;
import org.onosproject.net.device.DeviceServiceAdapter;
import org.onosproject.net.flowobjective.ForwardingObjective;
import org.onosproject.net.DeviceId;
@@ -71,6 +81,7 @@
import org.onosproject.net.intent.Constraint;
import org.onosproject.net.intent.IntentId;
import org.onosproject.net.intent.constraint.BandwidthConstraint;
+import org.onosproject.net.link.LinkEvent;
import org.onosproject.net.packet.DefaultInboundPacket;
import org.onosproject.net.packet.DefaultPacketContext;
import org.onosproject.net.packet.InboundPacket;
@@ -86,7 +97,9 @@
import org.onosproject.net.topology.PathServiceAdapter;
import org.onosproject.net.topology.Topology;
import org.onosproject.net.topology.TopologyEdge;
+import org.onosproject.net.topology.TopologyEvent;
import org.onosproject.net.topology.TopologyGraph;
+import org.onosproject.net.topology.TopologyListener;
import org.onosproject.net.topology.TopologyServiceAdapter;
import org.onosproject.net.topology.TopologyVertex;
import org.onosproject.pce.pceservice.PathComputationTest.MockPathResourceService;
@@ -97,6 +110,7 @@
import org.onosproject.pce.util.TunnelServiceAdapter;
import org.onosproject.pce.util.FlowObjServiceAdapter;
import org.onosproject.store.service.TestStorageService;
+
import com.google.common.collect.ImmutableSet;
/**
@@ -107,6 +121,7 @@
private PathComputationTest pathCompTest = new PathComputationTest();
private MockPathResourceService resourceService = pathCompTest.new MockPathResourceService();
private MockTopologyService topologyService = new MockTopologyService();
+ private MockMastershipService mastershipService = new MockMastershipService();
private MockPathService pathService = new MockPathService();
private PceManager pceManager = new PceManager();
private MockCoreService coreService = new MockCoreService();
@@ -131,11 +146,17 @@
private Link link1, link2, link3, link4;
protected static int flowsDownloaded;
private TunnelListener tunnelListener;
+ private TopologyListener listener;
+ private Topology topology;
+ private Set<TopologyEdge> edges;
+ private Set<TopologyVertex> vertexes;
@Before
- public void startUp() {
+ public void startUp() throws TestUtilsException {
+ listener = TestUtils.getField(pceManager, "topologyListener");
pceManager.pathService = pathService;
pceManager.resourceService = resourceService;
+ pceManager.topologyService = topologyService;
pceManager.tunnelService = tunnelService;
pceManager.coreService = coreService;
pceManager.storageService = storageService;
@@ -144,34 +165,52 @@
pceManager.labelRsrcService = labelResourceService;
pceManager.flowObjectiveService = flowObjectiveService;
pceManager.pceStore = pceStore;
+ pceManager.mastershipService = mastershipService;
pceManager.activate();
}
+ private class MockMastershipService extends MastershipServiceAdapter {
+ @Override
+ public MastershipRole getLocalRole(DeviceId deviceId) {
+ return MASTER;
+ }
+
+ @Override
+ public boolean isLocalMaster(DeviceId deviceId) {
+ return getLocalRole(deviceId) == MASTER;
+ }
+ }
+
private void build4RouterTopo(boolean setCost, boolean setPceccCap, boolean setSrCap,
boolean setLabelStackCap, int bandwidth) {
+ link1 = PathComputationTest.addLink(DEVICE1, 10, DEVICE2, 20, setCost, 50);
+ link2 = PathComputationTest.addLink(DEVICE2, 30, DEVICE4, 40, setCost, 20);
+ link3 = PathComputationTest.addLink(DEVICE1, 80, DEVICE3, 70, setCost, 100);
+ link4 = PathComputationTest.addLink(DEVICE3, 60, DEVICE4, 50, setCost, 80);
+
Set<TopologyVertex> vertexes = new HashSet<TopologyVertex>();
vertexes.add(D1);
vertexes.add(D2);
vertexes.add(D3);
vertexes.add(D4);
+ this.vertexes = vertexes;
+
Set<TopologyEdge> edges = new HashSet<TopologyEdge>();
- link1 = PathComputationTest.addLink(D1.deviceId().toString(), 10, D2.deviceId().toString(), 20, setCost, 50);
TopologyEdge edge1 = new DefaultTopologyEdge(D1, D2, link1);
edges.add(edge1);
- link2 = PathComputationTest.addLink(D2.deviceId().toString(), 30, D4.deviceId().toString(), 40, setCost, 20);
TopologyEdge edge2 = new DefaultTopologyEdge(D2, D4, link2);
edges.add(edge2);
- link3 = PathComputationTest.addLink(D1.deviceId().toString(), 80, D3.deviceId().toString(), 70, setCost, 100);
TopologyEdge edge3 = new DefaultTopologyEdge(D1, D3, link3);
edges.add(edge3);
- link4 = PathComputationTest.addLink(D3.deviceId().toString(), 60, D4.deviceId().toString(), 50, setCost, 80);
TopologyEdge edge4 = new DefaultTopologyEdge(D3, D4, link4);
edges.add(edge4);
+ this.edges = edges;
+
graph = new DefaultTopologyGraph(vertexes, edges);
DefaultAnnotations.Builder builderDev1 = DefaultAnnotations.builder();
@@ -800,6 +839,390 @@
assertThat(pceStore.getFailedPathInfoCount(), is(1));
}
+ /**
+ * Tests resilency when L2 link is down.
+ */
+ @Test
+ public void resilencyTest1() {
+ build4RouterTopo(true, false, false, false, 10);
+
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+ assertThat(pceStore.getTunnelInfoCount(), is(1));
+ assertThat(pceStore.getFailedPathInfoCount(), is(0));
+
+ List<Event> reasons = new LinkedList<>();
+ final LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove link2
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ topologyService.changeInTopology(getGraph(null, tempEdges));
+ listener.event(event);
+
+ List<Link> links = new LinkedList<>();
+ links.add(link3);
+ links.add(link4);
+
+ //Path is D1-D3-D4
+ assertThat(pathService.paths().iterator().next().links(), is(links));
+ assertThat(pathService.paths().iterator().next().cost(), is((double) 180));
+ }
+
+ /**
+ * Tests resilency when L2 and L4 link is down.
+ */
+ @Test
+ public void resilencyTest2() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link4);
+ reasons.add(linkEvent);
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove link2 and link4
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ tempEdges.add(new DefaultTopologyEdge(D3, D4, link4));
+ topologyService.changeInTopology(getGraph(null, tempEdges));
+ listener.event(event);
+
+ //No Path
+ assertThat(pathService.paths().size(), is(0));
+ }
+
+ /**
+ * Tests resilency when D2 device is down.
+ */
+ @Test
+ public void resilencyTest3() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link1);
+ reasons.add(linkEvent);
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove link2 and link1
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ tempEdges.add(new DefaultTopologyEdge(D1, D2, link1));
+ topologyService.changeInTopology(getGraph(null, tempEdges));
+ listener.event(event);
+
+ List<Link> links = new LinkedList<>();
+ links.add(link3);
+ links.add(link4);
+
+ //Path is D1-D3-D4
+ assertThat(pathService.paths().iterator().next().links(), is(links));
+ assertThat(pathService.paths().iterator().next().cost(), is((double) 180));
+ }
+
+ /**
+ * Tests resilency when ingress device is down.
+ */
+ @Test
+ public void resilencyTest4() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link3);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link1);
+ reasons.add(linkEvent);
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove link2 and link1
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D1, D3, link3));
+ tempEdges.add(new DefaultTopologyEdge(D1, D2, link1));
+ topologyService.changeInTopology(getGraph(null, tempEdges));
+ listener.event(event);
+
+ //No path
+ assertThat(pathService.paths().size(), is(0));
+ }
+
+ /**
+ * Tests resilency when D2 and D3 devices are down.
+ */
+ @Test
+ public void resilencyTest5() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link1);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link3);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link4);
+ reasons.add(linkEvent);
+
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove device2, device3 and all links
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D1, D2, link1));
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ tempEdges.add(new DefaultTopologyEdge(D1, D3, link3));
+ tempEdges.add(new DefaultTopologyEdge(D3, D4, link4));
+ Set<TopologyVertex> tempVertexes = new HashSet<>();
+ tempVertexes.add(D2);
+ tempVertexes.add(D3);
+ topologyService.changeInTopology(getGraph(tempVertexes, tempEdges));
+ listener.event(event);
+
+ //No path
+ assertThat(pathService.paths().size(), is(0));
+ }
+
+ /**
+ * Tests resilency when egress device is down.
+ */
+ @Test
+ public void resilencyTest6() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link4);
+ reasons.add(linkEvent);
+
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove device4 , link2 and link4
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ tempEdges.add(new DefaultTopologyEdge(D3, D4, link4));
+ Set<TopologyVertex> tempVertexes = new HashSet<>();
+ tempVertexes.add(D4);
+ topologyService.changeInTopology(getGraph(tempVertexes, tempEdges));
+ listener.event(event);
+
+ //No path
+ assertThat(pathService.paths().size(), is(0));
+ }
+
+ /**
+ * Tests resilency when egress device is down.
+ */
+ @Test
+ public void resilencyTest7() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link4);
+ reasons.add(linkEvent);
+
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove device4 , link2 and link4
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ tempEdges.add(new DefaultTopologyEdge(D3, D4, link4));
+ Set<TopologyVertex> tempVertexes = new HashSet<>();
+ tempVertexes.add(D4);
+ topologyService.changeInTopology(getGraph(tempVertexes, tempEdges));
+ listener.event(event);
+
+ //No path
+ assertThat(pathService.paths().size(), is(0));
+ }
+
+ /**
+ * Tests resilency when D2 device is suspended.
+ */
+ @Test
+ public void resilencyTest8() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link1);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove device2 , link1 and link2
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D1, D2, link1));
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ Set<TopologyVertex> tempVertexes = new HashSet<>();
+ tempVertexes.add(D2);
+ topologyService.changeInTopology(getGraph(tempVertexes, tempEdges));
+ listener.event(event);
+
+ List<Link> links = new LinkedList<>();
+ links.add(link3);
+ links.add(link4);
+
+ //Path is D1-D3-D4
+ assertThat(pathService.paths().iterator().next().links(), is(links));
+ assertThat(pathService.paths().iterator().next().cost(), is((double) 180));
+ }
+
+ /**
+ * Tests resilency when D2 device availability is changed.
+ */
+ @Test
+ public void resilencyTest11() {
+ build4RouterTopo(true, false, false, false, 10);
+
+ List<Constraint> constraints = new LinkedList<Constraint>();
+ CostConstraint costConstraint = new CostConstraint(COST);
+ constraints.add(costConstraint);
+ BandwidthConstraint localBwConst = new BandwidthConstraint(Bandwidth.bps(10));
+ constraints.add(localBwConst);
+
+ //Setup the path , tunnel created
+ boolean result = pceManager.setupPath(D1.deviceId(), D4.deviceId(), "T123", constraints, WITH_SIGNALLING);
+ assertThat(result, is(true));
+
+ List<Event> reasons = new LinkedList<>();
+ LinkEvent linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link1);
+ reasons.add(linkEvent);
+ linkEvent = new LinkEvent(LinkEvent.Type.LINK_REMOVED, link2);
+ reasons.add(linkEvent);
+
+ final TopologyEvent event = new TopologyEvent(
+ TopologyEvent.Type.TOPOLOGY_CHANGED,
+ topology,
+ reasons);
+
+ //Change Topology : remove device2 , link1 and link2
+ Set<TopologyEdge> tempEdges = new HashSet<>();
+ tempEdges.add(new DefaultTopologyEdge(D1, D2, link1));
+ tempEdges.add(new DefaultTopologyEdge(D2, D4, link2));
+ Set<TopologyVertex> tempVertexes = new HashSet<>();
+ tempVertexes.add(D2);
+ topologyService.changeInTopology(getGraph(tempVertexes, tempEdges));
+ listener.event(event);
+
+ List<Link> links = new LinkedList<>();
+ links.add(link3);
+ links.add(link4);
+
+ //Path is D1-D3-D4
+ assertThat(pathService.paths().iterator().next().links(), is(links));
+ assertThat(pathService.paths().iterator().next().cost(), is((double) 180));
+ }
+
@After
public void tearDown() {
pceManager.deactivate();
@@ -813,10 +1236,16 @@
pceManager.labelRsrcService = null;
pceManager.flowObjectiveService = null;
pceManager.pceStore = null;
+ pceManager.topologyService = null;
+ pceManager.mastershipService = null;
flowsDownloaded = 0;
}
private class MockTopologyService extends TopologyServiceAdapter {
+ private void changeInTopology(TopologyGraph graphModified) {
+ graph = graphModified;
+ }
+
@Override
public Set<Path> getPaths(Topology topology, DeviceId src, DeviceId dst, LinkWeight weight) {
DefaultTopologyVertex srcV = new DefaultTopologyVertex(src);
@@ -837,8 +1266,27 @@
}
}
- private class MockPathService extends PathServiceAdapter {
+ private TopologyGraph getGraph(Set<TopologyVertex> removedVertex, Set<TopologyEdge> removedEdges) {
+ if (removedVertex != null) {
+ vertexes.remove(removedVertex);
+ removedVertex.forEach(v ->
+ {
+ vertexes.remove(v);
+ });
+ }
+ if (removedEdges != null) {
+ removedEdges.forEach(e ->
+ {
+ edges.remove(e);
+ });
+ }
+
+ return new DefaultTopologyGraph(vertexes, edges);
+ }
+
+ private class MockPathService extends PathServiceAdapter {
+ Set<Path> computedPaths;
@Override
public Set<Path> getPaths(ElementId src, ElementId dst, LinkWeight weight) {
// If either edge is null, bail with no paths.
@@ -848,7 +1296,12 @@
// Otherwise get all paths between the source and destination edge
// devices.
- return topologyService.getPaths(null, (DeviceId) src, (DeviceId) dst, weight);
+ computedPaths = topologyService.getPaths(null, (DeviceId) src, (DeviceId) dst, weight);
+ return computedPaths;
+ }
+
+ private Set<Path> paths() {
+ return computedPaths;
}
}
@@ -946,6 +1399,31 @@
return result.size() == 0 ? Collections.emptySet() : ImmutableSet.copyOf(result);
}
+
+ @Override
+ public Collection<Tunnel> queryAllTunnels() {
+ Collection<Tunnel> result = new HashSet<Tunnel>();
+
+ for (TunnelId tunnelId : tunnelIdAsKeyStore.keySet()) {
+ result.add(tunnelIdAsKeyStore.get(tunnelId));
+ }
+
+ return result.size() == 0 ? Collections.emptySet() : ImmutableSet.copyOf(result);
+ }
+ @Override
+ public Iterable<Tunnel> getTunnels(DeviceId deviceId) {
+ List<Tunnel> tunnelList = new LinkedList<>();
+
+ for (Tunnel t : tunnelIdAsKeyStore.values()) {
+ for (Link l : t.path().links()) {
+ if (l.src().deviceId().equals(deviceId) || l.dst().deviceId().equals(deviceId)) {
+ tunnelList.add(t);
+ break;
+ }
+ }
+ }
+ return tunnelList;
+ }
}
public static class MockCoreService extends CoreServiceAdapter {