Modified how to get DBOperator object
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java
index 3a324b1..fafcbc0 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/core/internal/TopoSwitchServiceImpl.java
@@ -1,6 +1,7 @@
package net.onrc.onos.ofcontroller.core.internal;
-import net.onrc.onos.graph.GraphDBOperation;
+import net.onrc.onos.graph.DBOperation;
+import net.onrc.onos.graph.GraphDBManager;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyService.ITopoSwitchService;
@@ -10,15 +11,15 @@
public class TopoSwitchServiceImpl implements ITopoSwitchService {
- private GraphDBOperation op;
+ private DBOperation dbop;
protected final static Logger log = LoggerFactory.getLogger(TopoSwitchServiceImpl.class);
- public TopoSwitchServiceImpl(String conf) {
- op = new GraphDBOperation(conf);
+ public TopoSwitchServiceImpl(final String dbStore, String conf) {
+ dbop = GraphDBManager.getDBOperation(dbStore, conf);
}
public TopoSwitchServiceImpl() {
- this("");
+ this("titan","/tmp/cassandra.titan");
}
public void finalize() {
@@ -27,34 +28,34 @@
@Override
public void close() {
- op.close();
+ dbop.close();
}
@Override
public Iterable<ISwitchObject> getActiveSwitches() {
// TODO Auto-generated method stub
- op.close(); //Commit to ensure we see latest data
- return op.getActiveSwitches();
+ dbop.close(); //Commit to ensure we see latest data
+ return dbop.getActiveSwitches();
}
@Override
public Iterable<ISwitchObject> getAllSwitches() {
// TODO Auto-generated method stub
- op.close(); //Commit to ensure we see latest data
- return op.getAllSwitches();
+ dbop.close(); //Commit to ensure we see latest data
+ return dbop.getAllSwitches();
}
@Override
public Iterable<ISwitchObject> getInactiveSwitches() {
// TODO Auto-generated method stub
- op.close(); //Commit to ensure we see latest data
- return op.getInactiveSwitches();
+ dbop.close(); //Commit to ensure we see latest data
+ return dbop.getInactiveSwitches();
}
@Override
public Iterable<IPortObject> getPortsOnSwitch(String dpid) {
- op.close(); //Commit to ensure we see latest data
- ISwitchObject switchObject = op.searchSwitch(dpid);
+ dbop.close(); //Commit to ensure we see latest data
+ ISwitchObject switchObject = dbop.searchSwitch(dpid);
if (switchObject != null) {
return switchObject.getPorts();
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java b/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
index dae0cf4..e4af36d 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/topology/TopologyManager.java
@@ -14,7 +14,6 @@
import net.onrc.onos.datagrid.IDatagridService;
import net.onrc.onos.graph.DBOperation;
import net.onrc.onos.graph.GraphDBManager;
-import net.onrc.onos.graph.GraphDBOperation;
import net.onrc.onos.ofcontroller.floodlightlistener.INetworkGraphService;
import net.onrc.onos.ofcontroller.util.DataPath;
import net.onrc.onos.ofcontroller.util.FlowEntry;