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%2Fdatabroker%2FConcurrentDOMDataBrokerTest.java;h=482045181a4b7a120f500cab1d2c605dd03129c4;hp=3a88a729cc8d56b8029159fe0bf2f29de6b2112d;hb=refs%2Fchanges%2F91%2F84091%2F17;hpb=8ec73bf853a9b6708b455c0321a585992e02b125 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java index 3a88a729cc..482045181a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBrokerTest.java @@ -19,8 +19,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateFalseFluentFuture; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateNullFluentFuture; +import static org.opendaylight.yangtools.util.concurrent.FluentFutures.immediateTrueFluentFuture; + +import com.google.common.base.Throwables; +import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableMap; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -42,24 +48,31 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.InOrder; -import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.opendaylight.controller.cluster.datastore.DistributedDataStore; import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException; -import org.opendaylight.controller.md.sal.common.api.data.DataStoreUnavailableException; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadOnlyTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransactionChain; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.DataStoreUnavailableException; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; +import org.opendaylight.mdsal.dom.api.DOMDataBrokerExtension; +import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeService; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohort; +import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry; +import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; +import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.api.DOMTransactionChain; +import org.opendaylight.mdsal.dom.api.DOMTransactionChainListener; +import org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper; +import org.opendaylight.mdsal.dom.spi.store.DOMStore; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadWriteTransaction; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransactionChain; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction; +import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStore; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; @@ -70,21 +83,21 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; */ public class ConcurrentDOMDataBrokerTest { - private final DOMDataWriteTransaction transaction = mock(DOMDataWriteTransaction.class); + private final DOMDataTreeWriteTransaction transaction = mock(DOMDataTreeWriteTransaction.class); private final DOMStoreThreePhaseCommitCohort mockCohort1 = mock(DOMStoreThreePhaseCommitCohort.class); private final DOMStoreThreePhaseCommitCohort mockCohort2 = mock(DOMStoreThreePhaseCommitCohort.class); private final ThreadPoolExecutor futureExecutor = - new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue()); + new ThreadPoolExecutor(0, 1, 5, TimeUnit.SECONDS, new SynchronousQueue<>()); private ConcurrentDOMDataBroker coordinator; @Before public void setup() { doReturn("tx").when(transaction).getIdentifier(); - DOMStore store = new InMemoryDOMDataStore("OPER", - MoreExecutors.newDirectExecutorService()); + DOMStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.newDirectExecutorService()); - coordinator = new ConcurrentDOMDataBroker(ImmutableMap.of(LogicalDatastoreType.OPERATIONAL, store), futureExecutor); + coordinator = new ConcurrentDOMDataBroker(ImmutableMap.of(LogicalDatastoreType.OPERATIONAL, store), + futureExecutor); } @After @@ -93,70 +106,65 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testSuccessfulSubmitAsync() throws Throwable { + public void testSuccessfulSubmitAsync() throws Exception { testSuccessfulSubmit(true); } @Test - public void testSuccessfulSubmitSync() throws Throwable { + public void testSuccessfulSubmitSync() throws Exception { testSuccessfulSubmit(false); } - private void testSuccessfulSubmit(final boolean doAsync) throws Throwable { + private void testSuccessfulSubmit(final boolean doAsync) throws InterruptedException { final CountDownLatch asyncCanCommitContinue = new CountDownLatch(1); - Answer> asyncCanCommit = new Answer>() { - @Override - public ListenableFuture answer(final InvocationOnMock invocation) { - final SettableFuture future = SettableFuture.create(); - if(doAsync) { - new Thread() { - @Override - public void run() { - Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue, - 10, TimeUnit.SECONDS); - future.set(true); - } - }.start(); - } else { - future.set(true); - } - - return future; + Answer> asyncCanCommit = invocation -> { + final SettableFuture future = SettableFuture.create(); + if (doAsync) { + new Thread(() -> { + Uninterruptibles.awaitUninterruptibly(asyncCanCommitContinue, + 10, TimeUnit.SECONDS); + future.set(Boolean.TRUE); + }).start(); + } else { + future.set(Boolean.TRUE); } + + return future; }; doAnswer(asyncCanCommit).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).commit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).commit(); - doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).commit(); + doReturn(immediateTrueFluentFuture()).when(mockCohort2).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).commit(); - CheckedFuture future = coordinator.submit( - transaction, Arrays.asList(mockCohort1, mockCohort2)); + ListenableFuture future = + coordinator.commit(transaction, Arrays.asList(mockCohort1, mockCohort2)); final CountDownLatch doneLatch = new CountDownLatch(1); final AtomicReference caughtEx = new AtomicReference<>(); - Futures.addCallback(future, new FutureCallback() { + Futures.addCallback(future, new FutureCallback() { @Override - public void onSuccess(final Void result) { + public void onSuccess(final CommitInfo result) { doneLatch.countDown(); } @Override - public void onFailure(final Throwable t) { - caughtEx.set(t); + public void onFailure(final Throwable failure) { + caughtEx.set(failure); doneLatch.countDown(); } - }); + }, MoreExecutors.directExecutor()); asyncCanCommitContinue.countDown(); - assertEquals("Submit complete", true, doneLatch.await(5, TimeUnit.SECONDS)); + assertTrue("Submit complete", doneLatch.await(5, TimeUnit.SECONDS)); - if(caughtEx.get() != null) { - throw caughtEx.get(); + if (caughtEx.get() != null) { + Throwables.throwIfUnchecked(caughtEx.get()); + throw new RuntimeException(caughtEx.get()); } assertEquals("Task count", doAsync ? 1 : 0, futureExecutor.getTaskCount()); @@ -172,35 +180,35 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithNegativeCanCommitResponse() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).abort(); - doReturn(Futures.immediateFuture(false)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + doReturn(Futures.immediateFuture(Boolean.FALSE)).when(mockCohort2).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).abort(); DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); - doReturn(Futures.immediateFuture(false)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); + doReturn(Futures.immediateFuture(Boolean.FALSE)).when(mockCohort3).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort3).abort(); - CheckedFuture future = coordinator.submit( + ListenableFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); assertFailure(future, null, mockCohort1, mockCohort2, mockCohort3); } - private static void assertFailure(final CheckedFuture future, - final Exception expCause, final DOMStoreThreePhaseCommitCohort... mockCohorts) - throws Exception { + private static void assertFailure(final ListenableFuture future, final Exception expCause, + final DOMStoreThreePhaseCommitCohort... mockCohorts) throws Exception { try { - future.checkedGet(5, TimeUnit.SECONDS); + future.get(5, TimeUnit.SECONDS); fail("Expected TransactionCommitFailedException"); - } catch (TransactionCommitFailedException e) { - if(expCause != null) { - assertSame("Expected cause", expCause.getClass(), e.getCause().getClass()); + } catch (ExecutionException e) { + TransactionCommitFailedException tcf = TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER.apply(e); + if (expCause != null) { + assertSame("Expected cause", expCause.getClass(), tcf.getCause().getClass()); } InOrder inOrder = inOrder((Object[])mockCohorts); - for(DOMStoreThreePhaseCommitCohort c: mockCohorts) { + for (DOMStoreThreePhaseCommitCohort c: mockCohorts) { inOrder.verify(c).abort(); } } catch (TimeoutException e) { @@ -210,14 +218,14 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithCanCommitException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).abort(); IllegalStateException cause = new IllegalStateException("mock"); doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2)); assertFailure(future, cause, mockCohort1, mockCohort2); @@ -225,14 +233,14 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithCanCommitDataStoreUnavailableException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).abort(); NoShardLeaderException rootCause = new NoShardLeaderException("mock"); DataStoreUnavailableException cause = new DataStoreUnavailableException(rootCause.getMessage(), rootCause); doReturn(Futures.immediateFailedFuture(rootCause)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2)); assertFailure(future, cause, mockCohort1, mockCohort2); @@ -240,22 +248,22 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithPreCommitException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).abort(); - doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit(); + doReturn(immediateTrueFluentFuture()).when(mockCohort2).canCommit(); IllegalStateException cause = new IllegalStateException("mock"); doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).abort(); DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); - doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))). - when(mockCohort3).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort3).canCommit(); + doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))) + .when(mockCohort3).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort3).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3); @@ -263,25 +271,25 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithCommitException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).preCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).commit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort1).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).preCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).commit(); + doReturn(immediateNullFluentFuture()).when(mockCohort1).abort(); - doReturn(Futures.immediateFuture(true)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).preCommit(); + doReturn(immediateTrueFluentFuture()).when(mockCohort2).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).preCommit(); IllegalStateException cause = new IllegalStateException("mock"); doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).commit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).abort(); DOMStoreThreePhaseCommitCohort mockCohort3 = mock(DOMStoreThreePhaseCommitCohort.class); - doReturn(Futures.immediateFuture(true)).when(mockCohort3).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).preCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))). - when(mockCohort3).commit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort3).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort3).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort3).preCommit(); + doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock2"))) + .when(mockCohort3).commit(); + doReturn(immediateNullFluentFuture()).when(mockCohort3).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2, mockCohort3)); assertFailure(future, cause, mockCohort1, mockCohort2, mockCohort3); @@ -289,22 +297,22 @@ public class ConcurrentDOMDataBrokerTest { @Test public void testSubmitWithAbortException() throws Exception { - doReturn(Futures.immediateFuture(true)).when(mockCohort1).canCommit(); - doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock abort error"))). - when(mockCohort1).abort(); + doReturn(immediateTrueFluentFuture()).when(mockCohort1).canCommit(); + doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock abort error"))) + .when(mockCohort1).abort(); IllegalStateException cause = new IllegalStateException("mock canCommit error"); doReturn(Futures.immediateFailedFuture(cause)).when(mockCohort2).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort2).abort(); + doReturn(immediateNullFluentFuture()).when(mockCohort2).abort(); - CheckedFuture future = coordinator.submit( + FluentFuture future = coordinator.commit( transaction, Arrays.asList(mockCohort1, mockCohort2)); assertFailure(future, cause, mockCohort1, mockCohort2); } @Test - public void testCreateReadWriteTransaction(){ + public void testCreateReadWriteTransaction() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -316,7 +324,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateWriteOnlyTransaction(){ + public void testCreateWriteOnlyTransaction() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -328,7 +336,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateReadOnlyTransaction(){ + public void testCreateReadOnlyTransaction() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -340,7 +348,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testLazySubTransactionCreationForReadWriteTransactions(){ + public void testLazySubTransactionCreationForReadWriteTransactions() { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreReadWriteTransaction storeTxn = mock(DOMStoreReadWriteTransaction.class); @@ -351,16 +359,16 @@ public class ConcurrentDOMDataBrokerTest { try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor)) { - DOMDataReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction dataTxn = dataBroker.newReadWriteTransaction(); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); verify(configDomStore, never()).newReadWriteTransaction(); verify(operationalDomStore, times(1)).newReadWriteTransaction(); - dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); verify(configDomStore, times(1)).newReadWriteTransaction(); verify(operationalDomStore, times(1)).newReadWriteTransaction(); @@ -369,7 +377,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testLazySubTransactionCreationForWriteOnlyTransactions(){ + public void testLazySubTransactionCreationForWriteOnlyTransactions() { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreWriteTransaction storeTxn = mock(DOMStoreWriteTransaction.class); @@ -380,15 +388,15 @@ public class ConcurrentDOMDataBrokerTest { try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor)) { - DOMDataWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction(); + DOMDataTreeWriteTransaction dataTxn = dataBroker.newWriteOnlyTransaction(); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); verify(configDomStore, never()).newWriteOnlyTransaction(); verify(operationalDomStore, times(1)).newWriteOnlyTransaction(); - dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + dataTxn.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), mock(NormalizedNode.class)); verify(configDomStore, times(1)).newWriteOnlyTransaction(); verify(operationalDomStore, times(1)).newWriteOnlyTransaction(); @@ -396,7 +404,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testLazySubTransactionCreationForReadOnlyTransactions(){ + public void testLazySubTransactionCreationForReadOnlyTransactions() { DOMStore configDomStore = mock(DOMStore.class); DOMStore operationalDomStore = mock(DOMStore.class); DOMStoreReadTransaction storeTxn = mock(DOMStoreReadTransaction.class); @@ -407,15 +415,15 @@ public class ConcurrentDOMDataBrokerTest { try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor)) { - DOMDataReadOnlyTransaction dataTxn = dataBroker.newReadOnlyTransaction(); + DOMDataTreeReadTransaction dataTxn = dataBroker.newReadOnlyTransaction(); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); - dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); + dataTxn.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); verify(configDomStore, never()).newReadOnlyTransaction(); verify(operationalDomStore, times(1)).newReadOnlyTransaction(); - dataTxn.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + dataTxn.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); verify(configDomStore, times(1)).newReadOnlyTransaction(); verify(operationalDomStore, times(1)).newReadOnlyTransaction(); @@ -431,8 +439,8 @@ public class ConcurrentDOMDataBrokerTest { doReturn(mockStoreReadWriteTransaction).when(operationalDomStore).newReadWriteTransaction(); doReturn(mockCohort).when(mockStoreReadWriteTransaction).ready(); - doReturn(Futures.immediateFuture(false)).when(mockCohort).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohort).abort(); + doReturn(immediateFalseFluentFuture()).when(mockCohort).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohort).abort(); final CountDownLatch latch = new CountDownLatch(1); final List commitCohorts = new ArrayList<>(); @@ -441,19 +449,20 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction transaction, Collection cohorts) { + public FluentFuture commit(DOMDataTreeWriteTransaction writeTx, + Collection cohorts) { commitCohorts.addAll(cohorts); latch.countDown(); - return super.submit(transaction, cohorts); + return super.commit(writeTx, cohorts); } }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + domDataReadWriteTransaction.delete(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); - domDataReadWriteTransaction.submit(); + domDataReadWriteTransaction.commit(); - latch.await(10, TimeUnit.SECONDS); + assertTrue(latch.await(10, TimeUnit.SECONDS)); assertTrue(commitCohorts.size() == 1); } @@ -472,12 +481,12 @@ public class ConcurrentDOMDataBrokerTest { doReturn(configTransaction).when(configDomStore).newReadWriteTransaction(); doReturn(mockCohortOperational).when(operationalTransaction).ready(); - doReturn(Futures.immediateFuture(false)).when(mockCohortOperational).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohortOperational).abort(); + doReturn(immediateFalseFluentFuture()).when(mockCohortOperational).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohortOperational).abort(); doReturn(mockCohortConfig).when(configTransaction).ready(); - doReturn(Futures.immediateFuture(false)).when(mockCohortConfig).canCommit(); - doReturn(Futures.immediateFuture(null)).when(mockCohortConfig).abort(); + doReturn(immediateFalseFluentFuture()).when(mockCohortConfig).canCommit(); + doReturn(immediateNullFluentFuture()).when(mockCohortConfig).abort(); final CountDownLatch latch = new CountDownLatch(1); final List commitCohorts = new ArrayList<>(); @@ -486,33 +495,37 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, operationalDomStore, LogicalDatastoreType.CONFIGURATION, configDomStore), futureExecutor) { @Override - public CheckedFuture submit(DOMDataWriteTransaction transaction, Collection cohorts) { + @SuppressWarnings("checkstyle:hiddenField") + public FluentFuture commit(DOMDataTreeWriteTransaction writeTx, + Collection cohorts) { commitCohorts.addAll(cohorts); latch.countDown(); - return super.submit(transaction, cohorts); + return super.commit(writeTx, cohorts); } }) { - DOMDataReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); + DOMDataTreeReadWriteTransaction domDataReadWriteTransaction = dataBroker.newReadWriteTransaction(); - domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); - domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + domDataReadWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), + mock(NormalizedNode.class)); + domDataReadWriteTransaction.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), + mock(NormalizedNode.class)); - domDataReadWriteTransaction.submit(); + domDataReadWriteTransaction.commit(); - latch.await(10, TimeUnit.SECONDS); + assertTrue(latch.await(10, TimeUnit.SECONDS)); assertTrue(commitCohorts.size() == 2); } } @Test - public void testCreateTransactionChain(){ + public void testCreateTransactionChain() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), futureExecutor)) { - dataBroker.createTransactionChain(mock(TransactionChainListener.class)); + dataBroker.createTransactionChain(mock(DOMTransactionChainListener.class)); verify(domStore, times(2)).createTransactionChain(); } @@ -520,7 +533,7 @@ public class ConcurrentDOMDataBrokerTest { } @Test - public void testCreateTransactionOnChain(){ + public void testCreateTransactionOnChain() { DOMStore domStore = mock(DOMStore.class); try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), @@ -532,13 +545,15 @@ public class ConcurrentDOMDataBrokerTest { doReturn(mockChain).when(domStore).createTransactionChain(); doReturn(operationalTransaction).when(mockChain).newWriteOnlyTransaction(); - DOMTransactionChain transactionChain = dataBroker.createTransactionChain(mock(TransactionChainListener.class)); + DOMTransactionChain transactionChain = dataBroker.createTransactionChain( + mock(DOMTransactionChainListener.class)); - DOMDataWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction(); + DOMDataTreeWriteTransaction domDataWriteTransaction = transactionChain.newWriteOnlyTransaction(); verify(mockChain, never()).newWriteOnlyTransaction(); - domDataWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY, mock(NormalizedNode.class)); + domDataWriteTransaction.put(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(), + mock(NormalizedNode.class)); } } @@ -549,13 +564,13 @@ public class ConcurrentDOMDataBrokerTest { LogicalDatastoreType.OPERATIONAL, domStore, LogicalDatastoreType.CONFIGURATION, domStore), futureExecutor)) { - CheckedFuture submit1 = dataBroker.newWriteOnlyTransaction().submit(); + FluentFuture submit1 = dataBroker.newWriteOnlyTransaction().commit(); assertNotNull(submit1); submit1.get(); - CheckedFuture submit2 = dataBroker.newReadWriteTransaction().submit(); + FluentFuture submit2 = dataBroker.newReadWriteTransaction().commit(); assertNotNull(submit2); @@ -563,4 +578,28 @@ public class ConcurrentDOMDataBrokerTest { } } + @Test + public void testExtensions() { + DistributedDataStore mockConfigStore = mock(DistributedDataStore.class); + DistributedDataStore mockOperStore = mock(DistributedDataStore.class); + try (ConcurrentDOMDataBroker dataBroker = new ConcurrentDOMDataBroker(ImmutableMap.of( + LogicalDatastoreType.OPERATIONAL, mockOperStore, + LogicalDatastoreType.CONFIGURATION, mockConfigStore), futureExecutor)) { + + ClassToInstanceMap supportedExtensions = dataBroker.getExtensions(); + assertNotNull(supportedExtensions.getInstance(DOMDataTreeChangeService.class)); + + DOMDataTreeCommitCohortRegistry cohortRegistry = supportedExtensions.getInstance( + DOMDataTreeCommitCohortRegistry.class); + assertNotNull(cohortRegistry); + + DOMDataTreeCommitCohort mockCohort = mock(DOMDataTreeCommitCohort.class); + DOMDataTreeIdentifier path = new DOMDataTreeIdentifier( + org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION, + YangInstanceIdentifier.empty()); + cohortRegistry.registerCommitCohort(path, mockCohort); + + verify(mockConfigStore).registerCommitCohort(path, mockCohort); + } + } }