commit a684b6ea9913feb0f42e1af6cbb1e990581e9b98
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Thu May 18 22:29:22 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Fri May 19 15:45:52 2017 +0000
tree 561b4338fd9232af05aab818cb2a97e09814010e
parent b1b4489de0efe8eba26281232d42635d210173ab

Add K-shortest path API to PathService.

Change-Id: I96732666f31a7a2b2df9a16f63e77bc0a367da83

core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java

diff --git a/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
index ec650da..6f0a1b8 100644
--- a/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
+++ b/core/net/src/main/java/org/onosproject/net/topology/impl/PathManager.java
@@ -34,6 +34,7 @@
 import org.slf4j.Logger;
 
 import java.util.Set;
+import java.util.stream.Stream;
 import java.util.Map;
 
 
@@ -90,6 +91,12 @@
         return super.getPaths(src, dst, weigher);
     }
 
+    @Override
+    public Stream<Path> getKShortestPaths(ElementId src, ElementId dst,
+                                          LinkWeigher weigher) {
+        checkPermission(TOPOLOGY_READ);
+        return super.getKShortestPaths(src, dst, weigher);
+    }
 
     @Override
     public Set<DisjointPath> getDisjointPaths(ElementId src, ElementId dst) {

core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java b/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
index cca8b4a..bb899d2 100644
--- a/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/topology/impl/PathManagerTest.java
@@ -35,6 +35,7 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -74,6 +75,10 @@
         fakeTopoMgr.paths.add(createPath("src", "middle", "dst"));
         Set<Path> paths = service.getPaths(src, dst);
         validatePaths(paths, 1, 2, src, dst);
+
+        validatePaths(service.getKShortestPaths(src, dst)
+                          .collect(Collectors.toSet()),
+                      1, 2, src, dst);
     }
 
     @Test
@@ -105,6 +110,10 @@
         fakeHostMgr.hosts.put(dst, host("12:34:56:78:90:ef/1", "dstEdge"));
         Set<Path> paths = service.getPaths(src, dst);
         validatePaths(paths, 1, 4, src, dst);
+
+        validatePaths(service.getKShortestPaths(src, dst)
+                      .collect(Collectors.toSet()),
+                  1, 4, src, dst);
     }
 
     @Test
@@ -115,6 +124,10 @@
         fakeHostMgr.hosts.put(dst, host("12:34:56:78:90:ef/1", "edge"));
         Set<Path> paths = service.getPaths(src, dst);
         validatePaths(paths, 1, 2, src, dst);
+
+        validatePaths(service.getKShortestPaths(src, dst)
+                      .collect(Collectors.toSet()),
+                  1, 2, src, dst);
     }
 
     @Test