Work toward fixing ONOS-1031: Remove or comment-out references to the old TopologyManager
Removed or commented-out references to the old TopologyManager:
ofcontroller.topology.TopologyManager
* BgpRoute.java
OnosDeviceManager.java
Comment-out references to the old TopologyManager and add TODO markers
* NetworkGraphPublisher.java
Comment-out references to the old TopologyManager
NOTE: This file will go away in the near future.
* Forwarding.java
Removed a reference to the old TopologyManager, because it is not
needed/used.
* KryoFactory.java
Removed references to the TopologyElement class, because it will go away
* ControllerTest.java
Removed reference to the TopologyManager
Change-Id: Ib94fa91b4a7795c9dca4037cf36399f75ea1d2c1
diff --git a/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
index 64e2447..501dbf0 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
@@ -47,9 +47,6 @@
import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscoveryService;
import net.onrc.onos.ofcontroller.proxyarp.IArpRequester;
import net.onrc.onos.ofcontroller.proxyarp.IProxyArpService;
-import net.onrc.onos.ofcontroller.topology.ITopologyNetService;
-import net.onrc.onos.ofcontroller.topology.Topology;
-import net.onrc.onos.ofcontroller.topology.TopologyManager;
import net.onrc.onos.ofcontroller.util.CallerId;
import net.onrc.onos.ofcontroller.util.DataPath;
import net.onrc.onos.ofcontroller.util.Dpid;
@@ -96,7 +93,6 @@
private IFloodlightProviderService floodlightProvider;
private ITopologyService topologyService;
- private ITopologyNetService topologyNetService;
private ILinkDiscoveryService linkDiscoveryService;
private IRestApiService restApi;
private IProxyArpService proxyArp;
@@ -158,7 +154,8 @@
private FlowCache flowCache;
- private volatile Topology topology = null;
+ // TODO: Fix for the new Topology Network Graph
+ // private volatile Topology topology = null;
private class TopologyChangeDetector implements Runnable {
@Override
@@ -290,7 +287,6 @@
ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
topologyChangeDetectorTask = new SingletonTask(executor, new TopologyChangeDetector());
- topologyNetService = new TopologyManager(context);
topoSwitchService = new TopoSwitchServiceImpl();
pathsWaitingOnArp = new HashMap<InetAddress, Path>();
@@ -1149,7 +1145,8 @@
private void beginRouting(){
log.debug("Topology is now ready, beginning routing function");
- topology = topologyNetService.newDatabaseTopology();
+ // TODO: Fix for the new Topology Network Graph
+ // topology = topologyNetService.newDatabaseTopology();
// Wait Pavlin's API. We need the following functions.
/*setupArpFlows();
@@ -1201,6 +1198,8 @@
continue;
}
+ // TODO: Fix for the new Topology Network Graph
+ /*
DataPath shortestPath = topologyNetService.getDatabaseShortestPath(
srcInterface.getSwitchPort(), dstInterface.getSwitchPort());
@@ -1209,6 +1208,7 @@
srcInterface.getSwitchPort(), dstInterface.getSwitchPort());
return;
}
+ */
}
}
topologyReady = true;