* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.openflowplugin.impl.device;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-import com.google.common.util.concurrent.CheckedFuture;
-import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.FluentFuture;
import com.google.common.util.concurrent.ListenableFuture;
import io.netty.util.HashedWheelTimer;
import java.lang.reflect.Field;
-import java.math.BigInteger;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import org.junit.Assert;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Mockito;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-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.mockito.junit.MockitoJUnitRunner;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
import org.opendaylight.openflowplugin.api.openflow.connection.ConnectionContext;
import org.opendaylight.openflowplugin.api.openflow.device.DeviceContext;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.NonZeroUint16Type;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.NonZeroUint32Type;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.provider.config.rev160510.OpenflowProviderConfigBuilder;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
@RunWith(MockitoJUnitRunner.class)
.createNodeInstanceIdentifier(DUMMY_NODE_ID);
@Mock
- private CheckedFuture<Void, TransactionCommitFailedException> mockedFuture;
+ private FluentFuture<CommitInfo> mockedFuture;
@Mock
private FeaturesReply mockFeatures;
@Mock
@Mock
private WriteTransaction writeTransaction;
@Mock
- private BindingTransactionChain transactionChain;
+ private TransactionChain transactionChain;
@Mock
private Capabilities capabilities;
@Mock
@Before
public void setUp() throws Exception {
- when(mockConnectionContext.getNodeId()).thenReturn(DUMMY_NODE_ID);
when(mockConnectionContext.getFeatures()).thenReturn(mockFeatures);
when(mockConnectionContext.getConnectionAdapter()).thenReturn(mockedConnectionAdapter);
when(mockConnectionContext.getDeviceInfo()).thenReturn(deviceInfo);
- when(mockedDeviceContext.getPrimaryConnectionContext()).thenReturn(mockConnectionContext);
when(deviceInfo.getNodeInstanceIdentifier()).thenReturn(DUMMY_IDENTIFIER);
when(deviceInfo.getNodeId()).thenReturn(DUMMY_NODE_ID);
- when(mockFeatures.getCapabilities()).thenReturn(capabilities);
- when(mockFeatures.getCapabilitiesV10()).thenReturn(capabilitiesV10);
- when(mockFeatures.getDatapathId()).thenReturn(BigInteger.valueOf(21L));
-
when(mockedFuture.isDone()).thenReturn(true);
- when(writeTransaction.submit()).thenReturn(mockedFuture);
- when(transactionChain.newWriteOnlyTransaction()).thenReturn(writeTransaction);
- when(dataBroker.createTransactionChain(any(TransactionChainListener.class))).thenReturn(transactionChain);
+ doReturn(mockedFuture).when(writeTransaction).commit();
when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTransaction);
deviceManager = new DeviceManagerImpl(
deviceManager.setTranslatorLibrary(translatorLibrary);
verify(dataBroker).newWriteOnlyTransaction();
verify(writeTransaction).merge(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
- verify(writeTransaction).submit();
+ verify(writeTransaction).commit();
}
@Test
@Test
public void removeDeviceFromOperationalDS() throws Exception {
- final ListenableFuture<Void> future = deviceManager
+ final ListenableFuture<?> future = deviceManager
.removeDeviceFromOperationalDS(DUMMY_IDENTIFIER);
future.get();
@Test(expected = ExecutionException.class)
public void removeDeviceFromOperationalDSException() throws Exception {
- final CheckedFuture<Void, TransactionCommitFailedException> failedFuture =
- Futures.immediateFailedCheckedFuture(
+ final FluentFuture<CommitInfo> failedFuture = FluentFutures.immediateFailedFluentFuture(
new TransactionCommitFailedException("Test failed transaction"));
- Mockito.when(writeTransaction.submit()).thenReturn(failedFuture);
- final ListenableFuture<Void> future = deviceManager
- .removeDeviceFromOperationalDS(DUMMY_IDENTIFIER);
+ Mockito.doReturn(failedFuture).when(writeTransaction).commit();
+ final ListenableFuture<?> future = deviceManager.removeDeviceFromOperationalDS(DUMMY_IDENTIFIER);
future.get();
assertTrue(future.isDone());
verify(writeTransaction).delete(LogicalDatastoreType.OPERATIONAL, DUMMY_IDENTIFIER);