X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FMemberNode.java;h=e3686fd227174e8b2a3058bd8c50cef8e2ff7be7;hp=9db9635e27f2cdddc87f9efc2a2c8dd1f8b409cf;hb=4e3f49788c05730b29468deebc2aaa4ed0d94eef;hpb=104ce145c9cd637c9b1caecfe0fe02c4ce4f343c 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 9db9635e27..e3686fd227 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 @@ -26,6 +26,7 @@ import com.typesafe.config.ConfigFactory; import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; +import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.utils.ActorContext; import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState; @@ -146,7 +147,7 @@ public class MemberNode { String... peerMemberNames) throws Exception { final Set peerIds = Sets.newHashSet(); for(String p: peerMemberNames) { - peerIds.add(ShardIdentifier.builder().memberName(p).shardName(shardName). + peerIds.add(ShardIdentifier.builder().memberName(MemberName.forName(p)).shardName(shardName). type(datastore.getActorContext().getDataStoreName()).build().toString()); } @@ -269,7 +270,7 @@ public class MemberNode { node.kit = new IntegrationTestKit(system, datastoreContextBuilder); - String memberName = new ClusterWrapperImpl(system).getCurrentMemberName(); + String memberName = new ClusterWrapperImpl(system).getCurrentMemberName().getName(); node.kit.getDatastoreContextBuilder().shardManagerPersistenceId("shard-manager-config-" + memberName); node.configDataStore = node.kit.setupDistributedDataStore("config_" + testName, moduleShardsConfig, true, schemaContext, waitForshardLeader);