first commit
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImplTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImplTest.java
index 9b1c4d6..08b8176 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImplTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/LinkStorageImplTest.java
@@ -120,7 +120,7 @@
mockToPortInfoMap = new HashMap<IPortObject,PortInfo>();
linkStorage = new LinkStorageImpl();
- linkStorage.init("/dummy/path/to/conf");
+ linkStorage.init("dummyStore", "/dummy/path/to/conf");
initLinks();
}
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
index f276680..7d26f2f 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTest.java
@@ -33,6 +33,7 @@
protected static org.slf4j.Logger log = LoggerFactory.getLogger(SwitchStorageImpl.class);
String conf;
+ String dbStore;
private GraphDBConnection mockConn = null;
private GraphDBOperation mockOpe = null;
private GraphDBOperation realOpe = null;
@@ -43,6 +44,7 @@
public void setUp() throws Exception {
swSt = new SwitchStorageImpl();
+ dbStore = "dummyStore";
conf = "/dummy/path/to/db";
// Make mock cassandra DB
@@ -96,7 +98,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
}
@@ -129,7 +131,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addSwitch(dpid);
}
@@ -153,7 +155,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
}
@@ -185,7 +187,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
}
@@ -220,7 +222,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.update(dpid, stateINACTIVE, opUPDATE);
}
@@ -255,7 +257,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.update(dpid, stateINACTIVE, opCREATE);
}
@@ -290,7 +292,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.update(dpid, stateINACTIVE, opINSERT);
}
@@ -325,7 +327,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.update(dpid, stateACTIVE, opDELETE);
}
@@ -359,7 +361,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.deleteSwitch(dpid);
@@ -399,7 +401,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.deleteSwitch(dpid);
}
@@ -450,7 +452,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addPort(dpid, portToAdd);
}
@@ -502,7 +504,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addPort(dpid, portToAdd);
}
@@ -542,7 +544,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addPort(dpid, portToAdd);
}
@@ -592,7 +594,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addPort(dpid, portToAdd);
}
@@ -645,7 +647,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addPort(dpid, portToAdd);
}
@@ -705,7 +707,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addPort(dpid, portToAdd);
swSt.deletePort(dpid, portNumber);
@@ -766,7 +768,7 @@
mockOpe.close();
replay(mockOpe);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
swSt.addSwitch(dpid);
swSt.addPort(dpid, portToAdd);
swSt.deletePort(dpid, portNumber);
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
index 19ac709..1a006ef 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/SwitchStorageImplTestBB.java
@@ -7,7 +7,6 @@
import net.onrc.onos.graph.GraphDBOperation;
import net.onrc.onos.ofcontroller.core.ISwitchStorage;
import net.onrc.onos.ofcontroller.core.ISwitchStorage.SwitchState;
-import net.onrc.onos.ofcontroller.core.internal.SwitchStorageImpl;
import net.onrc.onos.ofcontroller.core.INetMapStorage;
import net.onrc.onos.ofcontroller.core.INetMapStorage.DM_OPERATION;
import net.onrc.onos.ofcontroller.core.INetMapTopologyObjects.IPortObject;
@@ -35,6 +34,7 @@
protected static org.slf4j.Logger log = LoggerFactory.getLogger(SwitchStorageImpl.class);
String conf;
+ String dbStore;
private GraphDBConnection conn = null;
private GraphDBOperation ope = null;
private TitanGraph titanGraph = null;
@@ -45,6 +45,7 @@
swSt = new SwitchStorageImpl();
conf = "/dummy/path/to/db";
+ dbStore ="dummyStore";
// Make mock cassandra DB
// Replace TitanFactory.open() to return mock DB
@@ -57,7 +58,7 @@
conn = GraphDBConnection.getInstance(conf);
ope = new GraphDBOperation(conn);
- swSt.init(conf);
+ swSt.init(dbStore, conf);
}
@After
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java
index 2f90d48..a09970b 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableLinkStorageImpl.java
@@ -2,7 +2,6 @@
import java.util.Set;
-import net.onrc.onos.ofcontroller.core.internal.LinkStorageImpl;
import com.thinkaurelius.titan.core.TitanGraph;
import com.tinkerpop.blueprints.TransactionalGraph.Conclusion;
@@ -26,7 +25,7 @@
}
@Override
- public void init(String conf){
+ public void init(final String dbStore, final String conf){
Set<String> s = graph.getIndexedKeys(Vertex.class);
if (!s.contains("dpid")) {
graph.createKeyIndex("dpid", Vertex.class);
diff --git a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableSwitchStorageImpl.java b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableSwitchStorageImpl.java
index e0b34e1..82d1faf 100644
--- a/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableSwitchStorageImpl.java
+++ b/src/test/java/net/onrc/onos/ofcontroller/core/internal/TestableSwitchStorageImpl.java
@@ -18,9 +18,9 @@
}
@Override
- public void init(String conf){
+ public void init(final String dbStore, final String conf){
- super.init(conf);
+ super.init(dbStore, conf);
}
}