Revert "Modified TopoSwitchServiceImpl constructor"
This reverts commit 068d20f1c6c259edfbc953c40d86335ba69018e8.
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 8a7f39c..3a324b1 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,7 +1,6 @@
package net.onrc.onos.ofcontroller.core.internal;
-import net.onrc.onos.graph.DBOperation;
-import net.onrc.onos.graph.GraphDBManager;
+import net.onrc.onos.graph.GraphDBOperation;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.ISwitchObject;
import net.onrc.onos.ofcontroller.core.INetMapTopologyService.ITopoSwitchService;
@@ -11,15 +10,15 @@
public class TopoSwitchServiceImpl implements ITopoSwitchService {
- private DBOperation dbop;
+ private GraphDBOperation op;
protected final static Logger log = LoggerFactory.getLogger(TopoSwitchServiceImpl.class);
- public TopoSwitchServiceImpl(final String dbStore, String conf) {
- dbop = GraphDBManager.getDBOperation(dbStore, conf);
+ public TopoSwitchServiceImpl(String conf) {
+ op = new GraphDBOperation(conf);
}
public TopoSwitchServiceImpl() {
- this("","");
+ this("");
}
public void finalize() {
@@ -28,34 +27,34 @@
@Override
public void close() {
- dbop.close();
+ op.close();
}
@Override
public Iterable<ISwitchObject> getActiveSwitches() {
// TODO Auto-generated method stub
- dbop.close(); //Commit to ensure we see latest data
- return dbop.getActiveSwitches();
+ op.close(); //Commit to ensure we see latest data
+ return op.getActiveSwitches();
}
@Override
public Iterable<ISwitchObject> getAllSwitches() {
// TODO Auto-generated method stub
- dbop.close(); //Commit to ensure we see latest data
- return dbop.getAllSwitches();
+ op.close(); //Commit to ensure we see latest data
+ return op.getAllSwitches();
}
@Override
public Iterable<ISwitchObject> getInactiveSwitches() {
// TODO Auto-generated method stub
- dbop.close(); //Commit to ensure we see latest data
- return dbop.getInactiveSwitches();
+ op.close(); //Commit to ensure we see latest data
+ return op.getInactiveSwitches();
}
@Override
public Iterable<IPortObject> getPortsOnSwitch(String dpid) {
- dbop.close(); //Commit to ensure we see latest data
- ISwitchObject switchObject = dbop.searchSwitch(dpid);
+ op.close(); //Commit to ensure we see latest data
+ ISwitchObject switchObject = op.searchSwitch(dpid);
if (switchObject != null) {
return switchObject.getPorts();
}