Revert "Leader should always apply modifications as local"

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / test / java / org / opendaylight / controller / cluster / datastore / shardmanager / ShardPeerAddressResolverTest.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java
index bb76d085608c8953e922d5a0b3010720c903c297..0c18e799a5092a73bb266c26f6065eff021ce92b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardPeerAddressResolverTest.java
@@ -8,6 +8,7 @@
 package org.opendaylight.controller.cluster.datastore.shardmanager;
 
 import static org.junit.Assert.assertEquals;
+
 import akka.actor.Address;
 import com.google.common.collect.Sets;
 import java.util.Collection;
@@ -39,23 +40,23 @@ public class ShardPeerAddressResolverTest {
         resolver.addPeerAddress(MEMBER_3, address3);
         assertEquals("getPeerAddress", address3, resolver.getPeerAddress(MEMBER_3));
 
-        assertEquals("getShardActorAddress", address2.toString() +
-                "/user/shardmanager-config/member-2-shard-default-config",
+        assertEquals("getShardActorAddress",
+                address2.toString() + "/user/shardmanager-config/member-2-shard-default-config",
                 resolver.getShardActorAddress("default", MEMBER_2));
 
-        assertEquals("getShardActorAddress", address3.toString() +
-                "/user/shardmanager-config/member-3-shard-default-config",
+        assertEquals("getShardActorAddress",
+                address3.toString() + "/user/shardmanager-config/member-3-shard-default-config",
                 resolver.getShardActorAddress("default", MEMBER_3));
 
-        assertEquals("getShardActorAddress", address2.toString() +
-                "/user/shardmanager-config/member-2-shard-topology-config",
+        assertEquals("getShardActorAddress",
+                address2.toString() + "/user/shardmanager-config/member-2-shard-topology-config",
                 resolver.getShardActorAddress("topology", MEMBER_2));
 
         resolver.removePeerAddress(MEMBER_2);
         assertEquals("getShardActorAddress", null, resolver.getShardActorAddress("default", MEMBER_2));
         assertEquals("getShardActorAddress", null, resolver.getShardActorAddress("topology", MEMBER_2));
-        assertEquals("getShardActorAddress", address3.toString() +
-                "/user/shardmanager-config/member-3-shard-default-config",
+        assertEquals("getShardActorAddress",
+                address3.toString() + "/user/shardmanager-config/member-3-shard-default-config",
                 resolver.getShardActorAddress("default", MEMBER_3));
     }
 
@@ -73,12 +74,27 @@ public class ShardPeerAddressResolverTest {
         resolver.addPeerAddress(memberName, address);
 
         String shardAddress = resolver.getShardActorAddress("default", memberName);
-        assertEquals("getShardActorAddress", address.toString() +
-                "/user/shardmanager-" + type + "/" + memberName.getName() + "-shard-default-" + type, shardAddress);
+        assertEquals("getShardActorAddress", address.toString() + "/user/shardmanager-" + type + "/"
+                + memberName.getName() + "-shard-default-" + type, shardAddress);
 
         assertEquals("resolve", shardAddress, resolver.resolve(peerId));
     }
 
+    @Test
+    public void testSetResolved() {
+        String type = "config";
+        ShardPeerAddressResolver resolver = new ShardPeerAddressResolver(type, MEMBER_1);
+
+        String peerId = ShardIdentifier.create("default", MEMBER_2, type).toString();
+
+        String address = "akka.tcp://opendaylight-cluster-data@127.0.0.1:2550/user/shardmanager-" + type
+                + "/" + MEMBER_2.getName() + "-shard-default-" + type;
+
+        resolver.setResolved(peerId, address);
+
+        assertEquals("resolve", address, resolver.resolve(peerId));
+    }
+
     @Test
     public void testGetShardManagerPeerActorAddresses() {
         ShardPeerAddressResolver resolver = new ShardPeerAddressResolver("config", MEMBER_1);