X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FMemberNode.java;h=a7c702c6dcb4f39da89dc7e943ae20b93dc4b7b8;hb=82be660900ab9bdd84941a0c3498c1ae36982aba;hp=ab7de92484b2c2c28843f9bc690b7f5e6d859d3d;hpb=3859df9beca8f13f1ff2b2744ed3470a1715bec3;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java index ab7de92484..a7c702c6dc 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/MemberNode.java @@ -33,7 +33,7 @@ import org.opendaylight.controller.cluster.datastore.utils.ActorUtils; import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState; import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.slf4j.LoggerFactory; import scala.concurrent.Await; import scala.concurrent.Future; @@ -93,6 +93,7 @@ public class MemberNode { Stopwatch sw = Stopwatch.createStarted(); while (sw.elapsed(TimeUnit.SECONDS) <= 10) { CurrentClusterState state = Cluster.get(kit.getSystem()).state(); + for (Member m : state.getUnreachable()) { if (member.equals(m.getRoles().iterator().next())) { return; @@ -188,7 +189,7 @@ public class MemberNode { private boolean useAkkaArtery = true; private String[] waitForshardLeader = new String[0]; private String testName; - private SchemaContext schemaContext; + private EffectiveModelContext schemaContext; private boolean createOperDatastore = true; private DatastoreContext.Builder datastoreContextBuilder = DatastoreContext.newBuilder() .shardHeartbeatIntervalInMillis(300).shardElectionTimeoutFactor(30); @@ -262,7 +263,7 @@ public class MemberNode { * * @return this Builder */ - public Builder schemaContext(final SchemaContext newSchemaContext) { + public Builder schemaContext(final EffectiveModelContext newSchemaContext) { this.schemaContext = newSchemaContext; return this; }