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%2FPrefixShardCreationTest.java;h=289c6b72faad0c5bef52a2ae256302d6fac7dd23;hp=2a3431f67f4eaec569109217e302f8d61cd4e8a8;hb=c1336f9b497bc6867536a24f629c3f0b002ccb2f;hpb=5370e8be094b802caa732efb4da5a035c53dc9c6

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/PrefixShardCreationTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/PrefixShardCreationTest.java
index 2a3431f67f..289c6b72fa 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/PrefixShardCreationTest.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/PrefixShardCreationTest.java
@@ -9,33 +9,20 @@
 package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorRef;
-import akka.actor.ActorSystem;
-import akka.actor.AddressFromURIString;
 import akka.actor.Status.Success;
-import akka.cluster.Cluster;
-import akka.dispatch.Dispatchers;
 import akka.testkit.JavaTestKit;
-import akka.testkit.TestActorRef;
-import com.google.common.collect.Lists;
-import com.typesafe.config.ConfigFactory;
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
-import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.Shard.Builder;
 import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
 import org.opendaylight.controller.cluster.datastore.config.EmptyModuleShardConfigProvider;
 import org.opendaylight.controller.cluster.datastore.config.PrefixShardConfiguration;
-import org.opendaylight.controller.cluster.datastore.identifiers.ShardManagerIdentifier;
-import org.opendaylight.controller.cluster.datastore.messages.AddPrefixShardReplica;
 import org.opendaylight.controller.cluster.datastore.messages.CreatePrefixedShard;
 import org.opendaylight.controller.cluster.datastore.messages.FindLocalShard;
-import org.opendaylight.controller.cluster.datastore.messages.FindPrimary;
 import org.opendaylight.controller.cluster.datastore.messages.LocalShardFound;
 import org.opendaylight.controller.cluster.datastore.messages.LocalShardNotFound;
-import org.opendaylight.controller.cluster.datastore.messages.RemotePrimaryShardFound;
 import org.opendaylight.controller.cluster.datastore.messages.UpdateSchemaContext;
-import org.opendaylight.controller.cluster.datastore.shardmanager.ShardManagerTest.TestShardManager;
 import org.opendaylight.controller.cluster.datastore.shardstrategy.PrefixShardStrategy;
 import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils;
 import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
@@ -55,8 +42,6 @@ public class PrefixShardCreationTest extends AbstractShardManagerTest {
     private static final DOMDataTreeIdentifier TEST_ID =
             new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, TestModel.TEST_PATH);
 
-    private static final MemberName MEMBER_2 = MemberName.forName("member-2");
-
     @Test
     public void testPrefixShardCreation() throws Exception {
 
@@ -92,98 +77,4 @@ public class PrefixShardCreationTest extends AbstractShardManagerTest {
             }
         };
     }
-
-    @Test
-    public void testPrefixShardReplicas() throws Exception {
-        LOG.info("testPrefixShardReplicas starting");
-        final String shardManagerID = ShardManagerIdentifier.builder().type(shardMrgIDSuffix).build().toString();
-
-        // Create ACtorSystem for member-1
-        final ActorSystem system1 = newActorSystem("Member1");
-        Cluster.get(system1).join(AddressFromURIString.parse("akka.tcp://cluster-test@127.0.0.1:2558"));
-
-        final TestActorRef<TestShardManager> shardManager1 = TestActorRef.create(system1,
-                newTestShardMgrBuilder(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
-                        .waitTillReadyCountDownLatch(ready)
-                        .cluster(new ClusterWrapperImpl(system1))
-                        .props().withDispatcher(Dispatchers.DefaultDispatcherId()),
-                shardManagerID);
-
-        // Create an ActorSystem ShardManager actor for member-2.
-
-        final ActorSystem system2 = newActorSystem("Member2");
-
-        Cluster.get(system2).join(AddressFromURIString.parse("akka.tcp://cluster-test@127.0.0.1:2558"));
-
-        final TestActorRef<TestShardManager> shardManager2 = TestActorRef.create(system2,
-                newTestShardMgrBuilder()
-                        .configuration(new ConfigurationImpl(new EmptyModuleShardConfigProvider()))
-                        .waitTillReadyCountDownLatch(ready)
-                        .cluster(new ClusterWrapperImpl(system2)).props().withDispatcher(
-                        Dispatchers.DefaultDispatcherId()),
-                shardManagerID);
-
-        final JavaTestKit kit2 = new JavaTestKit(system2);
-
-        new JavaTestKit(system1) {
-            {
-                shardManager1.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-                shardManager2.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
-
-                // check shard does not exist
-                shardManager1.tell(new FindLocalShard(
-                        ClusterUtils.getCleanShardName(TestModel.TEST_PATH), true), getRef());
-                expectMsgClass(duration("5 seconds"), LocalShardNotFound.class);
-
-                shardManager2.tell(new FindLocalShard(
-                        ClusterUtils.getCleanShardName(TestModel.TEST_PATH), true), kit2.getRef());
-                kit2.expectMsgClass(duration("5 seconds"), LocalShardNotFound.class);
-
-                // create shard on node1
-                final Builder builder = Shard.builder();
-
-                final CreatePrefixedShard createPrefixedShard = new CreatePrefixedShard(
-                        new PrefixShardConfiguration(TEST_ID,
-                                PrefixShardStrategy.NAME,
-                                Lists.newArrayList(MEMBER_1, MEMBER_2)),
-                        datastoreContextBuilder.build(), builder);
-
-                shardManager1.tell(createPrefixedShard, getRef());
-                expectMsgClass(duration("5 seconds"), Success.class);
-
-                shardManager1.underlyingActor().waitForMemberUp();
-
-                LOG.info("changed leader state");
-
-                // check node2 cannot find it locally
-                shardManager1.tell(new FindLocalShard(
-                        ClusterUtils.getCleanShardName(TestModel.TEST_PATH), true), getRef());
-                expectMsgClass(duration("5 seconds"), LocalShardFound.class);
-
-                shardManager2.tell(new FindLocalShard(
-                        ClusterUtils.getCleanShardName(TestModel.TEST_PATH), true), kit2.getRef());
-                kit2.expectMsgClass(duration("5 seconds"), LocalShardNotFound.class);
-
-                // but can remotely
-                shardManager2.tell(new FindPrimary(
-                        ClusterUtils.getCleanShardName(TestModel.TEST_PATH), true), kit2.getRef());
-                kit2.expectMsgClass(duration("5 seconds"), RemotePrimaryShardFound.class);
-
-                // add replica and verify if succesful
-                shardManager2.tell(new AddPrefixShardReplica(TEST_ID.getRootIdentifier()), kit2.getRef());
-                kit2.expectMsgClass(duration("5 seconds"), Success.class);
-
-                // verify we have a replica on manager2 now
-                shardManager2.tell(new FindLocalShard(
-                        ClusterUtils.getCleanShardName(TestModel.TEST_PATH), true), kit2.getRef());
-                kit2.expectMsgClass(duration("5 seconds"), LocalShardFound.class);
-            }
-        };
-    }
-
-    private ActorSystem newActorSystem(final String config) {
-        final ActorSystem system = ActorSystem.create("cluster-test", ConfigFactory.load().getConfig(config));
-        actorSystems.add(system);
-        return system;
-    }
 }
\ No newline at end of file