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.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.slf4j.Logger;
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);
entityId, true);
getMapEntryNodeChild(entityEntry, Candidate.QNAME, CANDIDATE_NAME_QNAME, candidateName, expectPresent);
- } catch(AssertionError e) {
+ } catch (AssertionError e) {
throw new AssertionError("Verification of entity candidate failed - returned data was: " + node, e);
}
}
- 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) {
+ while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
NormalizedNode<?, ?> node = reader.apply(ENTITY_OWNERS_PATH);
try {
verifyEntityCandidate(node, entityType, entityId, candidateName, expectPresent);
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());
MapNode entityTypeMapNode = (MapNode) childNode.get();
Optional<MapEntryNode> entityTypeEntry = entityTypeMapNode.getChild(new NodeIdentifierWithPredicates(
childMap, child, key));
- if(expectPresent && !entityTypeEntry.isPresent()) {
+ if (expectPresent && !entityTypeEntry.isPresent()) {
fail("Missing " + childMap.toString() + " entry for " + key + ". Actual: " + entityTypeMapNode.getValue());
- } else if(!expectPresent && entityTypeEntry.isPresent()) {
+ } else if (!expectPresent && entityTypeEntry.isPresent()) {
fail("Found unexpected " + childMap.toString() + " entry for " + key);
}
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();
- while(sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
+ while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
try {
NormalizedNode<?, ?> node = reader.apply(entityPath);
Assert.assertNotNull("Owner was not set for entityId: " + entityId, node);
Assert.assertEquals("Entity owner", expected, node.getValue().toString());
return;
- } catch(AssertionError e) {
+ } catch (AssertionError e) {
lastError = e;
Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
}
throw lastError;
}
- protected void verifyNodeRemoved(YangInstanceIdentifier path,
- Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ 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);
+ } catch (Exception e) {
+ return null;
+ }
+ });
+ }
+
+ protected void verifyNodeRemoved(final YangInstanceIdentifier path,
+ final Function<YangInstanceIdentifier,NormalizedNode<?,?>> reader) {
AssertionError lastError = null;
Stopwatch sw = Stopwatch.createStarted();
- while(sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
+ while (sw.elapsed(TimeUnit.MILLISECONDS) <= 5000) {
try {
NormalizedNode<?, ?> node = reader.apply(path);
Assert.assertNull("Node was not removed at path: " + path, node);
return;
- } catch(AssertionError e) {
+ } catch (AssertionError e) {
lastError = e;
Uninterruptibles.sleepUninterruptibly(100, TimeUnit.MILLISECONDS);
}
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 {
- shardDataTree.notifyListeners(shardDataTree.commit(modification));
+ modification.ready();
+ shardDataTree.getDataTree().validate(modification);
+ final DataTreeCandidate candidate = shardDataTree.getDataTree().prepare(modification);
+ shardDataTree.getDataTree().commit(candidate);
+ shardDataTree.notifyListeners(candidate);
}
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) {
+ public boolean matches(final 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();
+ 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) {
+ public void describeTo(final Description description) {
description.appendValue(new DOMEntityOwnershipChange(expEntity, EntityOwnershipChangeState.from(
expWasOwner, expIsOwner, expHasOwner), expInJeopardy));
}
static DOMEntityOwnershipChange ownershipChange(final DOMEntity expEntity) {
return Matchers.argThat(new ArgumentMatcher<DOMEntityOwnershipChange>() {
@Override
- public boolean matches(Object argument) {
+ public boolean matches(final Object argument) {
DOMEntityOwnershipChange change = (DOMEntityOwnershipChange) argument;
return expEntity.equals(change.getEntity());
}
@Override
- public void describeTo(Description description) {
+ public void describeTo(final Description description) {
description.appendValue(new DOMEntityOwnershipChange(expEntity, EntityOwnershipChangeState.from(
false, false, false)));
}
});
}
- static void verifyOwner(final TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String localMemberName) {
- verifyOwner(localMemberName, entityType, entityId, path -> {
- try {
- return AbstractShardTest.readStore(shard, path);
- } catch(Exception e) {
- return null;
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ 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);
+ if (node != null) {
+ Assert.fail("Owner " + node.getValue() + " was set for " + entityPath);
}
- });
+
+ } catch (Exception e) {
+ throw new AssertionError("read failed", e);
+ }
}
- static void verifyRaftState(final TestActorRef<? extends EntityOwnershipShard> shard, Consumer<OnDemandRaftState> verifier)
+ static void verifyRaftState(final TestActorRef<? extends EntityOwnershipShard> shard,
+ final Consumer<OnDemandRaftState> verifier)
throws Exception {
AssertionError lastError = null;
Stopwatch sw = Stopwatch.createStarted();
- while(sw.elapsed(TimeUnit.SECONDS) <= 5) {
+ while (sw.elapsed(TimeUnit.SECONDS) <= 5) {
FiniteDuration operationDuration = Duration.create(5, TimeUnit.SECONDS);
Future<Object> future = Patterns.ask(shard, GetOnDemandRaftState.INSTANCE, new Timeout(operationDuration));
OnDemandRaftState raftState = (OnDemandRaftState)Await.result(future, operationDuration);
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());
}
- void verifyEntityCandidateRemoved(final TestActorRef<EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String candidateName) {
- verifyNodeRemoved(candidatePath(entityType, entityId, candidateName),
- path -> {
- try {
- return AbstractShardTest.readStore(shard, path);
- } catch(Exception e) {
- throw new AssertionError("Failed to read " + path, e);
- }
- });
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ 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);
+ } catch (Exception e) {
+ throw new AssertionError("Failed to read " + path, e);
+ }
+ });
}
- void verifyCommittedEntityCandidate(final TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String candidateName) {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ 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);
- } catch(Exception e) {
+ } catch (Exception e) {
throw new AssertionError("Failed to read " + path, e);
}
});
}
- void verifyNoEntityCandidate(final TestActorRef<? extends EntityOwnershipShard> shard, String entityType,
- YangInstanceIdentifier entityId, String candidateName) {
+ @SuppressWarnings("checkstyle:IllegalCatch")
+ 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);
- } catch(Exception e) {
+ } catch (Exception e) {
throw new AssertionError("Failed to read " + path, e);
}
}, false);
Code Review / controller.git / blobdiff