Removed directory src/main/java/net/onrc/onos/graph/
because it is not needed anymore.
Updated few files that still referred to that directory:
* NetworkGraphPublisher.java
This file will be removed in the future
* FlowSynchronizer.java
- Commented-out few places which referred to
src/main/java/net/onrc/onos/graph/
Currently, the FlowSynchronizer is disabled, and will be refactored
in the future
* FlowSynchronizerTest.java
Unit test for the FlowSynchronizer. The test needs to be updated
after FlowSynchronizer itself is refactored.
Change-Id: I3f8df81e64ad6000e44217a26408e3aaa0321670
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index c73a8e4..4c78d23 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -21,12 +21,7 @@
import net.floodlightcontroller.routing.Link;
import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.util.MACAddress;
-import net.onrc.onos.graph.DBOperation;
-import net.onrc.onos.graph.DBConnection;
-import net.onrc.onos.graph.GraphDBManager;
import net.onrc.onos.datagrid.IDatagridService;
-import net.onrc.onos.graph.IDBConnection;
-import net.onrc.onos.graph.LocalTopologyEventListener;
import net.onrc.onos.ofcontroller.core.INetMapStorage.DM_OPERATION;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
@@ -55,7 +50,7 @@
protected final static Logger log = LoggerFactory.getLogger(NetworkGraphPublisher.class);
//protected IDeviceService deviceService;
protected IControllerRegistryService registryService;
- protected DBOperation op;
+ // protected DBOperation op;
protected static final String DBConfigFile = "dbconf";
protected static final String GraphDBStore = "graph_db_store";
@@ -79,13 +74,13 @@
Thread.currentThread().setName("SwitchCleanup@" + old);
try {
log.debug("Running cleanup thread");
- op = GraphDBManager.getDBOperation();
+ // op = GraphDBManager.getDBOperation();
switchCleanup();
}
catch (Exception e) {
log.error("Error in cleanup thread", e);
} finally {
- op.close();
+ // op.close();
cleanupTask.reschedule(CLEANUP_TASK_INTERVAL,
TimeUnit.SECONDS);
Thread.currentThread().setName(old);
@@ -146,7 +141,8 @@
protected void switchCleanup() {
//op.close();
- Iterable<ISwitchObject> switches = op.getActiveSwitches();
+ // Iterable<ISwitchObject> switches = op.getActiveSwitches();
+ Iterable<ISwitchObject> switches = null;
log.debug("Checking for inactive switches");
// For each switch check if a controller exists in controller registry
@@ -169,7 +165,7 @@
e.printStackTrace();
}
}
- op.close();
+ // op.close();
}
@Override
@@ -458,7 +454,7 @@
Map<String, String> configMap = context.getConfigParams(this);
String conf = configMap.get(DBConfigFile);
String dbStore = configMap.get(GraphDBStore);
- op = GraphDBManager.getDBOperation();
+ // op = GraphDBManager.getDBOperation();
floodlightProvider =
context.getServiceImpl(IFloodlightProviderService.class);
@@ -474,6 +470,7 @@
@Override
public void startUp(FloodlightModuleContext context) {
+ /*
Map<String, String> configMap = context.getConfigParams(this);
String cleanupNeeded = configMap.get(CleanupEnabled);
@@ -495,6 +492,7 @@
// NOTE: No need to register with the Datagrid Service,
// because we don't need to receive any notifications from it.
//
+ */
}
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java
index 16a654f..83edc49 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/flowprogrammer/FlowSynchronizer.java
@@ -24,8 +24,6 @@
import org.slf4j.LoggerFactory;
import net.floodlightcontroller.core.IOFSwitch;
-import net.onrc.onos.graph.DBOperation;
-import net.onrc.onos.graph.GraphDBManager;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IFlowEntry;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
import net.onrc.onos.ofcontroller.flowprogrammer.IFlowPusherService.MsgPriority;
@@ -45,12 +43,14 @@
private static Logger log = LoggerFactory.getLogger(FlowSynchronizer.class);
- private DBOperation dbHandler;
+ // TODO: fix after FlowSynchronizer is refactored
+ // private DBOperation dbHandler;
protected IFlowPusherService pusher;
private Map<IOFSwitch, FutureTask<SyncResult>> switchThreads;
public FlowSynchronizer() {
- dbHandler = GraphDBManager.getDBOperation();
+ // TODO: fix after FlowSynchronizer is refactored
+ // dbHandler = GraphDBManager.getDBOperation();
switchThreads = new HashMap<IOFSwitch, FutureTask<SyncResult>>();
}
@@ -91,7 +91,8 @@
public Synchronizer(IOFSwitch sw) {
this.sw = sw;
Dpid dpid = new Dpid(sw.getId());
- this.swObj = dbHandler.searchSwitch(dpid.toString());
+ // TODO: fix after FlowSynchronizer is refactored
+ // this.swObj = dbHandler.searchSwitch(dpid.toString());
}
double graphIDTime, switchTime, compareTime, graphEntryTime, extractTime, pushTime, totalTime;
@@ -283,7 +284,8 @@
// Get the Flow Entry state from the Network Graph
if (iFlowEntry == null) {
try {
- iFlowEntry = dbHandler.searchFlowEntry(flowEntryId);
+ // TODO: fix after FlowSynchronizer is refactored
+ // iFlowEntry = dbHandler.searchFlowEntry(flowEntryId);
} catch (Exception e) {
log.error("Error finding flow entry {} in Network Graph",
flowEntryId);