Refactor the TopologyManager:
* Moved the Shortest Path computations to new class ShortestPath
inside file topology/ShortestPath.java
* Moved the topology-related state to new class Topology
inside file topology/Topology.java
* Renamed/cleanup the TopologyManager API:
- prepareShortestPathTopo() -> newDatabaseTopology()
- dropShortestPathTopo() -> dropTopology()
- getTopoShortestPath() -> getTopologyShortestPath()
- getShortestPath() -> getDatabaseShortestPath()
diff --git a/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java b/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java
index a730719..1cb39b3 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/topology/web/RouteResource.java
@@ -37,8 +37,9 @@
Port dstPort = new Port(Short.parseShort(dstPortStr));
DataPath result =
- topologyNetService.getShortestPath(new SwitchPort(srcDpid, srcPort),
- new SwitchPort(dstDpid, dstPort));
+ topologyNetService.getDatabaseShortestPath(
+ new SwitchPort(srcDpid, srcPort),
+ new SwitchPort(dstDpid, dstPort));
if (result != null) {
return result;
} else {