Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 7521: Convert byte[] to ShardManagerSnapshot in DatastoreSnapshot
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
test
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
shardmanager
/
ShardManagerGetSnapshotReplyActorTest.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
index 23002ca532831faf69871390a7c6cc52fbfbd35e..76af089b4d29bd4c13c78ff9b9f42a919c7592b6 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/shardmanager/ShardManagerGetSnapshotReplyActorTest.java
@@
-7,7
+7,6
@@
*/
package org.opendaylight.controller.cluster.datastore.shardmanager;
*/
package org.opendaylight.controller.cluster.datastore.shardmanager;
-import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import akka.actor.ActorRef;
import static org.junit.Assert.assertEquals;
import akka.actor.ActorRef;
@@
-15,6
+14,7
@@
import akka.actor.Status.Failure;
import akka.actor.Terminated;
import akka.testkit.JavaTestKit;
import java.util.Arrays;
import akka.actor.Terminated;
import akka.testkit.JavaTestKit;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@
-22,9
+22,13
@@
import org.junit.Test;
import org.opendaylight.controller.cluster.access.concepts.MemberName;
import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.access.concepts.MemberName;
import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
-import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot;
-import org.opendaylight.controller.cluster.datastore.messages.DatastoreSnapshot.ShardSnapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot.ShardSnapshot;
+import org.opendaylight.controller.cluster.datastore.persisted.ShardManagerSnapshot;
+import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry;
import org.opendaylight.controller.cluster.raft.client.messages.GetSnapshotReply;
import org.opendaylight.controller.cluster.raft.client.messages.GetSnapshotReply;
+import org.opendaylight.controller.cluster.raft.persisted.ByteState;
+import org.opendaylight.controller.cluster.raft.persisted.Snapshot;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
@@
-40,39
+44,47
@@
public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest {
public void testSuccess() {
JavaTestKit kit = new JavaTestKit(getSystem());
public void testSuccess() {
JavaTestKit kit = new JavaTestKit(getSystem());
- byte[] shardManagerSnapshot = new byte[]{0,5,9};
+ List<String> shardList = Arrays.asList("shard1", "shard2", "shard3");
+ ShardManagerSnapshot shardManagerSnapshot = new ShardManagerSnapshot(shardList);
ActorRef replyActor = getSystem().actorOf(ShardManagerGetSnapshotReplyActor.props(
ActorRef replyActor = getSystem().actorOf(ShardManagerGetSnapshotReplyActor.props(
-
Arrays.asList("shard1", "shard2", "shard3")
, "config", shardManagerSnapshot, kit.getRef(),
+
shardList
, "config", shardManagerSnapshot, kit.getRef(),
"shard-manager", Duration.create(100, TimeUnit.SECONDS)), "testSuccess");
kit.watch(replyActor);
"shard-manager", Duration.create(100, TimeUnit.SECONDS)), "testSuccess");
kit.watch(replyActor);
-
byte[] shard1Snapshot = new byte[]{1,2,3}
;
+
ByteState shard1SnapshotState = ByteState.of(new byte[]{1,2,3})
;
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(),
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(),
- shard1Snapshot), ActorRef.noSender());
+ Snapshot.create(shard1SnapshotState, Collections.<ReplicatedLogEntry>emptyList(),
+ 2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
-
byte[] shard2Snapshot = new byte[]{4,5,6}
;
+
ByteState shard2SnapshotState = ByteState.of(new byte[]{4,5,6})
;
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard2", MEMBER_1, "config").toString(),
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard2", MEMBER_1, "config").toString(),
- shard2Snapshot), ActorRef.noSender());
+ Snapshot.create(shard2SnapshotState, Collections.<ReplicatedLogEntry>emptyList(),
+ 2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
kit.expectNoMsg(FiniteDuration.create(500, TimeUnit.MILLISECONDS));
kit.expectNoMsg(FiniteDuration.create(500, TimeUnit.MILLISECONDS));
-
byte[] shard3Snapshot = new byte[]{7,8,9}
;
+
ByteState shard3SnapshotState = ByteState.of(new byte[]{7,8,9})
;
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard3", MEMBER_1, "config").toString(),
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard3", MEMBER_1, "config").toString(),
- shard3Snapshot), ActorRef.noSender());
+ Snapshot.create(shard3SnapshotState, Collections.<ReplicatedLogEntry>emptyList(),
+ 2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
DatastoreSnapshot datastoreSnapshot = kit.expectMsgClass(DatastoreSnapshot.class);
assertEquals("getType", "config", datastoreSnapshot.getType());
DatastoreSnapshot datastoreSnapshot = kit.expectMsgClass(DatastoreSnapshot.class);
assertEquals("getType", "config", datastoreSnapshot.getType());
- assertArrayEquals("getShardManagerSnapshot", shardManagerSnapshot, datastoreSnapshot.getShardManagerSnapshot());
+ assertEquals("getShardManagerSnapshot", shardManagerSnapshot.getShardList(),
+ datastoreSnapshot.getShardManagerSnapshot().getShardList());
List<ShardSnapshot> shardSnapshots = datastoreSnapshot.getShardSnapshots();
assertEquals("ShardSnapshot size", 3, shardSnapshots.size());
assertEquals("ShardSnapshot 1 getName", "shard1", shardSnapshots.get(0).getName());
List<ShardSnapshot> shardSnapshots = datastoreSnapshot.getShardSnapshots();
assertEquals("ShardSnapshot size", 3, shardSnapshots.size());
assertEquals("ShardSnapshot 1 getName", "shard1", shardSnapshots.get(0).getName());
- assertArrayEquals("ShardSnapshot 1 getSnapshot", shard1Snapshot, shardSnapshots.get(0).getSnapshot());
+ assertEquals("ShardSnapshot 1 getSnapshot", shard1SnapshotState,
+ shardSnapshots.get(0).getSnapshot().getState());
assertEquals("ShardSnapshot 2 getName", "shard2", shardSnapshots.get(1).getName());
assertEquals("ShardSnapshot 2 getName", "shard2", shardSnapshots.get(1).getName());
- assertArrayEquals("ShardSnapshot 2 getSnapshot", shard2Snapshot, shardSnapshots.get(1).getSnapshot());
+ assertEquals("ShardSnapshot 2 getSnapshot", shard2SnapshotState,
+ shardSnapshots.get(1).getSnapshot().getState());
assertEquals("ShardSnapshot 3 getName", "shard3", shardSnapshots.get(2).getName());
assertEquals("ShardSnapshot 3 getName", "shard3", shardSnapshots.get(2).getName());
- assertArrayEquals("ShardSnapshot 3 getSnapshot", shard3Snapshot, shardSnapshots.get(2).getSnapshot());
+ assertEquals("ShardSnapshot 3 getSnapshot", shard3SnapshotState,
+ shardSnapshots.get(2).getSnapshot().getState());
kit.expectMsgClass(Terminated.class);
}
kit.expectMsgClass(Terminated.class);
}
@@
-81,15
+93,15
@@
public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest {
public void testGetSnapshotFailureReply() {
JavaTestKit kit = new JavaTestKit(getSystem());
public void testGetSnapshotFailureReply() {
JavaTestKit kit = new JavaTestKit(getSystem());
- byte[] shardManagerSnapshot = new byte[]{0,5,9};
ActorRef replyActor = getSystem().actorOf(ShardManagerGetSnapshotReplyActor.props(
ActorRef replyActor = getSystem().actorOf(ShardManagerGetSnapshotReplyActor.props(
- Arrays.asList("shard1", "shard2"), "config",
shardManagerSnapshot
, kit.getRef(), "shard-manager",
+ Arrays.asList("shard1", "shard2"), "config",
null
, kit.getRef(), "shard-manager",
Duration.create(100, TimeUnit.SECONDS)), "testGetSnapshotFailureReply");
kit.watch(replyActor);
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(),
Duration.create(100, TimeUnit.SECONDS)), "testGetSnapshotFailureReply");
kit.watch(replyActor);
replyActor.tell(new GetSnapshotReply(ShardIdentifier.create("shard1", MEMBER_1, "config").toString(),
- new byte[]{1,2,3}), ActorRef.noSender());
+ Snapshot.create(ByteState.of(new byte[]{1,2,3}), Collections.<ReplicatedLogEntry>emptyList(),
+ 2, 1, 2, 1, 1, "member-1", null)), ActorRef.noSender());
replyActor.tell(new Failure(new RuntimeException()), ActorRef.noSender());
replyActor.tell(new Failure(new RuntimeException()), ActorRef.noSender());
@@
-101,9
+113,8
@@
public class ShardManagerGetSnapshotReplyActorTest extends AbstractActorTest {
public void testGetSnapshotTimeout() {
JavaTestKit kit = new JavaTestKit(getSystem());
public void testGetSnapshotTimeout() {
JavaTestKit kit = new JavaTestKit(getSystem());
- byte[] shardManagerSnapshot = new byte[]{0,5,9};
ActorRef replyActor = getSystem().actorOf(ShardManagerGetSnapshotReplyActor.props(
ActorRef replyActor = getSystem().actorOf(ShardManagerGetSnapshotReplyActor.props(
- Arrays.asList("shard1"), "config",
shardManagerSnapshot
, kit.getRef(), "shard-manager",
+ Arrays.asList("shard1"), "config",
null
, kit.getRef(), "shard-manager",
Duration.create(100, TimeUnit.MILLISECONDS)), "testGetSnapshotTimeout");
kit.watch(replyActor);
Duration.create(100, TimeUnit.MILLISECONDS)), "testGetSnapshotTimeout");
kit.watch(replyActor);