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 df870f584cedc8f5f9bbf4382de4aaf6fef1b279..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 =
-            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 =
-            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;
@@ -129,20 +125,20 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest {
             followerOperDatastore.close();
         }
 
-        JavaTestKit.shutdownActorSystem(leaderSystem);
-        JavaTestKit.shutdownActorSystem(followerSystem);
+        JavaTestKit.shutdownActorSystem(leaderSystem, null, Boolean.TRUE);
+        JavaTestKit.shutdownActorSystem(followerSystem, null, Boolean.TRUE);
 
         InMemoryJournal.clear();
         InMemorySnapshotStore.clear();
     }
 
-    private void initEmptyDatastores() {
+    private void initEmptyDatastores() throws Exception {
         leaderTestKit = new IntegrationTestKit(leaderSystem, leaderDatastoreContextBuilder);
 
-        leaderConfigDatastore = (DistributedDataStore) leaderTestKit.setupDistributedDataStore(
+        leaderConfigDatastore = leaderTestKit.setupDistributedDataStore(
                 "config", MODULE_SHARDS_CONFIG, true,
                 SchemaContextHelper.distributedShardedDOMDataTreeSchemaContext());
-        leaderOperDatastore = (DistributedDataStore) leaderTestKit.setupDistributedDataStore(
+        leaderOperDatastore = leaderTestKit.setupDistributedDataStore(
                 "operational", MODULE_SHARDS_CONFIG, true,
                 SchemaContextHelper.distributedShardedDOMDataTreeSchemaContext());
 
@@ -152,9 +148,9 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest {
 
         followerTestKit = new IntegrationTestKit(followerSystem, followerDatastoreContextBuilder);
 
-        followerConfigDatastore = (DistributedDataStore) followerTestKit.setupDistributedDataStore(
+        followerConfigDatastore = followerTestKit.setupDistributedDataStore(
                 "config", MODULE_SHARDS_CONFIG, true, SchemaContextHelper.distributedShardedDOMDataTreeSchemaContext());
-        followerOperDatastore = (DistributedDataStore) followerTestKit.setupDistributedDataStore(
+        followerOperDatastore = followerTestKit.setupDistributedDataStore(
                 "operational", MODULE_SHARDS_CONFIG, true,
                 SchemaContextHelper.distributedShardedDOMDataTreeSchemaContext());
 
@@ -162,6 +158,8 @@ public class DistributedShardedDOMDataTreeRemotingTest extends AbstractTest {
                 followerOperDatastore,
                 followerConfigDatastore);
 
+        followerTestKit.waitForMembersUp("member-1");
+
         leaderShardFactory.init();
         followerShardFactory.init();