Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Datastore: Reuse successful future"
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
BasicIntegrationTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/BasicIntegrationTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/BasicIntegrationTest.java
index e70453f2d629857dd92ef24b919395af91c9b742..6f131f301fe8985dade813ce2b00bf994c7a1bf6 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/BasicIntegrationTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/BasicIntegrationTest.java
@@
-62,9
+62,9
@@
public class BasicIntegrationTest extends AbstractActorTest {
.shardName("inventory").type("config").build();
final SchemaContext schemaContext = TestModel.createTestContext();
.shardName("inventory").type("config").build();
final SchemaContext schemaContext = TestModel.createTestContext();
-
ShardContext shardContext = new Shard
Context();
+
DatastoreContext datastoreContext = new Datastore
Context();
- final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
shard
Context);
+ final Props props = Shard.props(identifier, Collections.EMPTY_MAP,
datastore
Context);
final ActorRef shard = getSystem().actorOf(props);
new Within(duration("10 seconds")) {
final ActorRef shard = getSystem().actorOf(props);
new Within(duration("10 seconds")) {