*/
package org.opendaylight.controller.cluster.datastore.entityownership;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.CANDIDATE_NAME_QNAME;
import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_ID_QNAME;
import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.ENTITY_OWNERS_PATH;
import akka.testkit.TestActorRef;
import akka.util.Timeout;
import com.google.common.base.Function;
-import com.google.common.base.Optional;
import com.google.common.base.Stopwatch;
import com.google.common.util.concurrent.Uninterruptibles;
+import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
-import org.hamcrest.Description;
import org.junit.Assert;
-import org.mockito.ArgumentMatcher;
-import org.mockito.Matchers;
import org.opendaylight.controller.cluster.access.concepts.MemberName;
import org.opendaylight.controller.cluster.datastore.AbstractActorTest;
import org.opendaylight.controller.cluster.datastore.AbstractShardTest;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState;
import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState;
-import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipChange;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.clustering.entity.owners.rev150804.EntityOwners;
import org.slf4j.LoggerFactory;
import scala.concurrent.Await;
import scala.concurrent.Future;
-import scala.concurrent.duration.Duration;
import scala.concurrent.duration.FiniteDuration;
/**
private static final AtomicInteger NEXT_SHARD_NUM = new AtomicInteger();
- protected void verifyEntityCandidate(NormalizedNode<?, ?> node, String entityType,
- YangInstanceIdentifier entityId, String candidateName, boolean expectPresent) {
+ protected void verifyEntityCandidate(final NormalizedNode<?, ?> node, final String entityType,
+ final YangInstanceIdentifier entityId, final String candidateName, final boolean expectPresent) {
try {
assertNotNull("Missing " + EntityOwners.QNAME.toString(), node);
assertTrue(node instanceof ContainerNode);
}
}
- protected void verifyEntityCandidate(String entityType, YangInstanceIdentifier entityId, String candidateName,
- Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader, boolean expectPresent) {
+ protected void verifyEntityCandidate(final String entityType, final YangInstanceIdentifier entityId,
+ final String candidateName, final Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader,
+ final boolean expectPresent) {
AssertionError lastError = null;
Stopwatch sw = Stopwatch.createStarted();
while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
throw lastError;
}
- protected void verifyEntityCandidate(String entityType, YangInstanceIdentifier entityId, String candidateName,
- Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
+ protected void verifyEntityCandidate(final String entityType, final YangInstanceIdentifier entityId,
+ final String candidateName, final Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
verifyEntityCandidate(entityType, entityId, candidateName, reader, true);
}
- protected MapEntryNode getMapEntryNodeChild(DataContainerNode<? extends PathArgument> parent, QName childMap,
- QName child, Object key, boolean expectPresent) {
+ protected MapEntryNode getMapEntryNodeChild(final DataContainerNode<? extends PathArgument> parent,
+ final QName childMap, final QName child, final Object key, final boolean expectPresent) {
Optional<DataContainerChild<? extends PathArgument, ?>> childNode =
parent.getChild(new NodeIdentifier(childMap));
- assertEquals("Missing " + childMap.toString(), true, childNode.isPresent());
+ // We have to account for empty maps disappearing. If we expect the entry to be non-present, tolerate a missing
+ // map.
+ if (!expectPresent && !childNode.isPresent()) {
+ return null;
+ }
+
+ assertTrue("Missing " + childMap.toString(), childNode.isPresent());
MapNode entityTypeMapNode = (MapNode) childNode.get();
Optional<MapEntryNode> entityTypeEntry = entityTypeMapNode.getChild(new NodeIdentifierWithPredicates(
return entityTypeEntry.isPresent() ? entityTypeEntry.get() : null;
}
- static void verifyOwner(String expected, String entityType, YangInstanceIdentifier entityId,
- Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
+ static void verifyOwner(final String expected, final String entityType, final YangInstanceIdentifier entityId,
+ final Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
AssertionError lastError = null;
YangInstanceIdentifier entityPath = entityPath(entityType, entityId).node(ENTITY_OWNER_QNAME);
Stopwatch sw = Stopwatch.createStarted();
}
@SuppressWarnings("checkstyle:IllegalCatch")
- static void verifyOwner(final TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String localMemberName) {
+ static void verifyOwner(final TestActorRef<? extends EntityOwnershipShard> shard, final String entityType,
+ final YangInstanceIdentifier entityId, final String localMemberName) {
verifyOwner(localMemberName, entityType, entityId, path -> {
try {
return AbstractShardTest.readStore(shard, path);
});
}
- protected void verifyNodeRemoved(YangInstanceIdentifier path,
- Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
+ protected void verifyNodeRemoved(final YangInstanceIdentifier path,
+ final Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
AssertionError lastError = null;
Stopwatch sw = Stopwatch.createStarted();
while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
throw lastError;
}
- static void writeNode(YangInstanceIdentifier path, NormalizedNode<?, ?> node, ShardDataTree shardDataTree)
- throws DataValidationFailedException {
+ static void writeNode(final YangInstanceIdentifier path, final NormalizedNode<?, ?> node,
+ final ShardDataTree shardDataTree) throws DataValidationFailedException {
DataTreeModification modification = shardDataTree.newModification();
modification.merge(path, node);
commit(shardDataTree, modification);
}
- static void deleteNode(YangInstanceIdentifier path, ShardDataTree shardDataTree)
+ static void deleteNode(final YangInstanceIdentifier path, final ShardDataTree shardDataTree)
throws DataValidationFailedException {
DataTreeModification modification = shardDataTree.newModification();
modification.delete(path);
commit(shardDataTree, modification);
}
- static void commit(ShardDataTree shardDataTree, DataTreeModification modification)
+ static void commit(final ShardDataTree shardDataTree, final DataTreeModification modification)
throws DataValidationFailedException {
modification.ready();
shardDataTree.getDataTree().validate(modification);
static DOMEntityOwnershipChange ownershipChange(final DOMEntity expEntity, final boolean expWasOwner,
final boolean expIsOwner, final boolean expHasOwner, final boolean expInJeopardy) {
- return Matchers.argThat(new ArgumentMatcher<DOMEntityOwnershipChange>() {
- @Override
- public boolean matches(Object argument) {
- DOMEntityOwnershipChange change = (DOMEntityOwnershipChange) argument;
- return expEntity.equals(change.getEntity()) && expWasOwner == change.getState().wasOwner()
- && expIsOwner == change.getState().isOwner() && expHasOwner == change.getState().hasOwner()
- && expInJeopardy == change.inJeopardy();
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendValue(new DOMEntityOwnershipChange(expEntity, EntityOwnershipChangeState.from(
- expWasOwner, expIsOwner, expHasOwner), expInJeopardy));
- }
- });
+ return argThat(change -> expEntity.equals(change.getEntity()) && expWasOwner == change.getState().wasOwner()
+ && expIsOwner == change.getState().isOwner() && expHasOwner == change.getState().hasOwner()
+ && expInJeopardy == change.inJeopardy());
}
static DOMEntityOwnershipChange ownershipChange(final DOMEntity expEntity) {
- return Matchers.argThat(new ArgumentMatcher<DOMEntityOwnershipChange>() {
- @Override
- public boolean matches(Object argument) {
- DOMEntityOwnershipChange change = (DOMEntityOwnershipChange) argument;
- return expEntity.equals(change.getEntity());
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendValue(new DOMEntityOwnershipChange(expEntity, EntityOwnershipChangeState.from(
- false, false, false)));
- }
- });
+ return argThat(change -> expEntity.equals(change.getEntity()));
}
@SuppressWarnings("checkstyle:IllegalCatch")
- static void verifyNoOwnerSet(TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId) {
+ static void verifyNoOwnerSet(final TestActorRef<? extends EntityOwnershipShard> shard, final String entityType,
+ final YangInstanceIdentifier entityId) {
YangInstanceIdentifier entityPath = entityPath(entityType, entityId).node(ENTITY_OWNER_QNAME);
try {
NormalizedNode<?, ?> node = AbstractShardTest.readStore(shard, entityPath);
}
static void verifyRaftState(final TestActorRef<? extends EntityOwnershipShard> shard,
- Consumer<OnDemandRaftState> verifier)
+ final Consumer<OnDemandRaftState> verifier)
throws Exception {
AssertionError lastError = null;
Stopwatch sw = Stopwatch.createStarted();
while (sw.elapsed(TimeUnit.SECONDS) <= 5) {
- FiniteDuration operationDuration = Duration.create(5, TimeUnit.SECONDS);
+ FiniteDuration operationDuration = FiniteDuration.create(5, TimeUnit.SECONDS);
Future<Object> future = Patterns.ask(shard, GetOnDemandRaftState.INSTANCE, new Timeout(operationDuration));
OnDemandRaftState raftState = (OnDemandRaftState)Await.result(future, operationDuration);
try {
throw lastError;
}
- static ShardIdentifier newShardId(String memberName) {
+ static ShardIdentifier newShardId(final String memberName) {
return ShardIdentifier.create("entity-ownership", MemberName.forName(memberName),
"operational" + NEXT_SHARD_NUM.getAndIncrement());
}
@SuppressWarnings("checkstyle:IllegalCatch")
- void verifyEntityCandidateRemoved(final TestActorRef<EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String candidateName) {
+ void verifyEntityCandidateRemoved(final TestActorRef<EntityOwnershipShard> shard, final String entityType,
+ final YangInstanceIdentifier entityId, final String candidateName) {
verifyNodeRemoved(candidatePath(entityType, entityId, candidateName), path -> {
try {
return AbstractShardTest.readStore(shard, path);
}
@SuppressWarnings("checkstyle:IllegalCatch")
- void verifyCommittedEntityCandidate(final TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String candidateName) {
+ void verifyCommittedEntityCandidate(final TestActorRef<? extends EntityOwnershipShard> shard,
+ final String entityType, final YangInstanceIdentifier entityId, final String candidateName) {
verifyEntityCandidate(entityType, entityId, candidateName, path -> {
try {
return AbstractShardTest.readStore(shard, path);
}
@SuppressWarnings("checkstyle:IllegalCatch")
- void verifyNoEntityCandidate(final TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String candidateName) {
+ void verifyNoEntityCandidate(final TestActorRef<? extends EntityOwnershipShard> shard, final String entityType,
+ final YangInstanceIdentifier entityId, final String candidateName) {
verifyEntityCandidate(entityType, entityId, candidateName, path -> {
try {
return AbstractShardTest.readStore(shard, path);
Code Review / controller.git / blobdiff