Doh! Forgot to ignite SimpleFlowRuleStore as a component. Pingall now works again!
diff --git a/core/net/src/test/java/org/onlab/onos/net/topology/impl/PathManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/topology/impl/PathManagerTest.java
new file mode 100644
index 0000000..2ecf7f5
--- /dev/null
+++ b/core/net/src/test/java/org/onlab/onos/net/topology/impl/PathManagerTest.java
@@ -0,0 +1,148 @@
+package org.onlab.onos.net.topology.impl;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.ElementId;
+import org.onlab.onos.net.Host;
+import org.onlab.onos.net.HostId;
+import org.onlab.onos.net.Path;
+import org.onlab.onos.net.host.HostService;
+import org.onlab.onos.net.host.HostServiceAdapter;
+import org.onlab.onos.net.provider.ProviderId;
+import org.onlab.onos.net.topology.LinkWeight;
+import org.onlab.onos.net.topology.PathService;
+import org.onlab.onos.net.topology.Topology;
+import org.onlab.onos.net.topology.TopologyService;
+import org.onlab.onos.net.topology.TopologyServiceAdapter;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.onlab.onos.net.NetTestTools.*;
+
+/**
+ * Test of the path selection subsystem.
+ */
+public class PathManagerTest {
+
+ private static final ProviderId PID = new ProviderId("of", "foo");
+
+ private PathManager mgr;
+ private PathService service;
+
+ private FakeTopoMgr fakeTopoMgr = new FakeTopoMgr();
+ private FakeHostMgr fakeHostMgr = new FakeHostMgr();
+
+ @Before
+ public void setUp() {
+ mgr = new PathManager();
+ service = mgr;
+ mgr.topologyService = fakeTopoMgr;
+ mgr.hostService = fakeHostMgr;
+ mgr.activate();
+ }
+
+ @After
+ public void tearDown() {
+ mgr.deactivate();
+ }
+
+ @Test
+ public void infraToInfra() {
+ DeviceId src = did("src");
+ DeviceId dst = did("dst");
+ fakeTopoMgr.paths.add(createPath("src", "middle", "dst"));
+ Set<Path> paths = service.getPaths(src, dst);
+ validatePaths(paths, 1, 2, src, dst);
+ }
+
+ @Test
+ public void infraToEdge() {
+ DeviceId src = did("src");
+ HostId dst = hid("dst");
+ fakeTopoMgr.paths.add(createPath("src", "middle", "edge"));
+ fakeHostMgr.hosts.put(dst, host("dst", "edge"));
+ Set<Path> paths = service.getPaths(src, dst);
+ validatePaths(paths, 1, 3, src, dst);
+ }
+
+ @Test
+ public void edgeToInfra() {
+ HostId src = hid("src");
+ DeviceId dst = did("dst");
+ fakeTopoMgr.paths.add(createPath("edge", "middle", "dst"));
+ fakeHostMgr.hosts.put(src, host("src", "edge"));
+ Set<Path> paths = service.getPaths(src, dst);
+ validatePaths(paths, 1, 3, src, dst);
+ }
+
+ @Test
+ public void edgeToEdge() {
+ HostId src = hid("src");
+ HostId dst = hid("dst");
+ fakeTopoMgr.paths.add(createPath("srcEdge", "middle", "dstEdge"));
+ fakeHostMgr.hosts.put(src, host("src", "srcEdge"));
+ fakeHostMgr.hosts.put(dst, host("dst", "dstEdge"));
+ Set<Path> paths = service.getPaths(src, dst);
+ validatePaths(paths, 1, 4, src, dst);
+ }
+
+ @Test
+ public void edgeToEdgeDirect() {
+ HostId src = hid("src");
+ HostId dst = hid("dst");
+ fakeHostMgr.hosts.put(src, host("src", "edge"));
+ fakeHostMgr.hosts.put(dst, host("dst", "edge"));
+ Set<Path> paths = service.getPaths(src, dst);
+ validatePaths(paths, 1, 2, src, dst);
+ }
+
+ @Test
+ public void noEdge() {
+ Set<Path> paths = service.getPaths(hid("src"), hid("dst"));
+ assertTrue("there should be no paths", paths.isEmpty());
+ }
+
+ // Makes sure the set of paths meets basic expectations.
+ private void validatePaths(Set<Path> paths, int count, int length,
+ ElementId src, ElementId dst) {
+ assertEquals("incorrect path count", count, paths.size());
+ for (Path path : paths) {
+ assertEquals("incorrect length", length, path.links().size());
+ assertEquals("incorrect source", src, path.src().elementId());
+ assertEquals("incorrect destination", dst, path.dst().elementId());
+ }
+ }
+
+ // Fake entity to give out paths.
+ private class FakeTopoMgr extends TopologyServiceAdapter implements TopologyService {
+ Set<Path> paths = new HashSet<>();
+
+ @Override
+ public Set<Path> getPaths(Topology topology, DeviceId src, DeviceId dst) {
+ return paths;
+ }
+
+ @Override
+ public Set<Path> getPaths(Topology topology, DeviceId src, DeviceId dst, LinkWeight weight) {
+ return paths;
+ }
+ }
+
+ // Fake entity to give out hosts.
+ private class FakeHostMgr extends HostServiceAdapter implements HostService {
+ private Map<HostId, Host> hosts = new HashMap<>();
+
+ @Override
+ public Host getHost(HostId hostId) {
+ return hosts.get(hostId);
+ }
+ }
+
+}