Network Graph Refactoring: create a separate NetworkGraphImpl instance
within TopologyManager instead of extending it.
Change-Id: I01126a2004af984b873e46d86fbe521ca1f86ddb
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java
index 4b2ef34..6ae4777 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/NetworkGraphModule.java
@@ -21,7 +21,7 @@
// This is initialized as a module for now
// private RCNetworkGraphPublisher eventListener;
- private TopologyManager networkGraph;
+ private TopologyManager topologyManager;
//private NetworkGraphDatastore southboundNetworkGraph;
private IDatagridService datagridService;
private IControllerRegistryService registryService;
@@ -64,24 +64,24 @@
registryService = context.getServiceImpl(IControllerRegistryService.class);
networkGraphListeners = new CopyOnWriteArrayList<>();
- networkGraph = new TopologyManager(registryService, networkGraphListeners);
+ topologyManager = new TopologyManager(registryService, networkGraphListeners);
//southboundNetworkGraph = new NetworkGraphDatastore(networkGraph);
}
@Override
public void startUp(FloodlightModuleContext context) {
restApi.addRestletRoutable(new NetworkGraphWebRoutable());
- networkGraph.startup(datagridService);
+ topologyManager.startup(datagridService);
}
@Override
public NetworkGraph getNetworkGraph() {
- return networkGraph;
+ return topologyManager.getNetworkGraph();
}
@Override
public NetworkGraphDiscoveryInterface getNetworkGraphDiscoveryInterface() {
- return networkGraph;
+ return topologyManager;
}
@Override