import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils;
import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore;
-import org.opendaylight.controller.cluster.sharding.DistributedShardFactory.DistributedShardRegistration;
import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
followerOperDatastore.close();
}
- TestKit.shutdownActorSystem(leaderSystem, Boolean.TRUE);
- TestKit.shutdownActorSystem(followerSystem, Boolean.TRUE);
+ TestKit.shutdownActorSystem(leaderSystem, true);
+ TestKit.shutdownActorSystem(followerSystem, true);
InMemoryJournal.clear();
InMemorySnapshotStore.clear();
LOG.info("Initializing leader DistributedShardedDOMDataTree");
leaderShardFactory.init();
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
- ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY));
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
+ ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty()));
- leaderTestKit.waitUntilLeader(leaderOperDatastore.getActorContext(),
- ClusterUtils.getCleanShardName(YangInstanceIdentifier.EMPTY));
+ leaderTestKit.waitUntilLeader(leaderOperDatastore.getActorUtils(),
+ ClusterUtils.getCleanShardName(YangInstanceIdentifier.empty()));
LOG.info("Initializing follower DistributedShardedDOMDataTree");
followerShardFactory.init();
TEST_ID, Lists.newArrayList(AbstractTest.MEMBER_NAME, AbstractTest.MEMBER_2_NAME)),
DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION);
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier()));
- final ActorRef leaderShardManager = leaderConfigDatastore.getActorContext().getShardManager();
+ final ActorRef leaderShardManager = leaderConfigDatastore.getActorUtils().getShardManager();
- assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier())));
- assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier())));
final Set<String> peers = new HashSet<>();
DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION);
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier()));
- findLocalShard(followerConfigDatastore.getActorContext(),
+ findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TEST_ID.getRootIdentifier()));
final Set<String> peers = new HashSet<>();
cursor.close();
LOG.warn("Got to pre submit");
- tx.submit().checkedGet();
+ tx.commit().get();
shardRegistration.close().toCompletableFuture().get();
Lists.newArrayList(AbstractTest.MEMBER_NAME, AbstractTest.MEMBER_2_NAME)),
DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION);
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH));
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH));
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH));
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.JUNK_PATH));
// check leader has local shards
- assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH)));
- assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH)));
- assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH)));
- assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.JUNK_PATH)));
// check follower has local shards
- assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH)));
- assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH)));
- assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH)));
- assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.JUNK_PATH)));
LOG.debug("Closing registrations");
reg3.close().toCompletableFuture().get();
reg4.close().toCompletableFuture().get();
- waitUntilShardIsDown(leaderConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH));
- waitUntilShardIsDown(leaderConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH));
- waitUntilShardIsDown(leaderConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH));
- waitUntilShardIsDown(leaderConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.JUNK_PATH));
LOG.debug("All leader shards gone");
- waitUntilShardIsDown(followerConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH));
- waitUntilShardIsDown(followerConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.OUTER_CONTAINER_PATH));
- waitUntilShardIsDown(followerConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.INNER_LIST_PATH));
- waitUntilShardIsDown(followerConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.JUNK_PATH));
LOG.debug("All follower shards gone");
TEST_ID, Lists.newArrayList(AbstractTest.MEMBER_NAME, AbstractTest.MEMBER_2_NAME)),
DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION);
- leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorContext(),
+ leaderTestKit.waitUntilLeader(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH));
- assertNotNull(findLocalShard(leaderConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH)));
- assertNotNull(findLocalShard(followerConfigDatastore.getActorContext(),
+ assertNotNull(findLocalShard(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH)));
waitOnAsyncTask(reg1.close(), DistributedShardedDOMDataTree.SHARD_FUTURE_TIMEOUT_DURATION);
- waitUntilShardIsDown(leaderConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(leaderConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH));
- waitUntilShardIsDown(followerConfigDatastore.getActorContext(),
+ waitUntilShardIsDown(followerConfigDatastore.getActorUtils(),
ClusterUtils.getCleanShardName(TestModel.TEST_PATH));
}