Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 8301: Fix some issues with testProducerRegistrations
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
sharding
/
DistributedShardedDOMDataTreeRemotingTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java
index d81cedb5a90b65aae91f7ad021f48987d603c003..36a533e67be8a2a41f2f9c18acb4e0bdcc58238a 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/sharding/DistributedShardedDOMDataTreeRemotingTest.java
@@
-70,14
+70,10
@@
public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest {
private final Builder leaderDatastoreContextBuilder =
private final Builder leaderDatastoreContextBuilder =
- DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(5)
- .logicalStoreType(
- org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION);
+ DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(5);
private final DatastoreContext.Builder followerDatastoreContextBuilder =
private final DatastoreContext.Builder followerDatastoreContextBuilder =
- DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(5)
- .logicalStoreType(
- org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION);
+ DatastoreContext.newBuilder().shardHeartbeatIntervalInMillis(100).shardElectionTimeoutFactor(5);
private DistributedDataStore leaderConfigDatastore;
private DistributedDataStore leaderOperDatastore;
private DistributedDataStore leaderConfigDatastore;
private DistributedDataStore leaderOperDatastore;
@@
-162,6
+158,8
@@
public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest {
followerOperDatastore,
followerConfigDatastore);
followerOperDatastore,
followerConfigDatastore);
+ followerTestKit.waitForMembersUp("member-1");
+
leaderShardFactory.init();
followerShardFactory.init();
leaderShardFactory.init();
followerShardFactory.init();