X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-topology-singleton%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Ftopology%2Fsingleton%2Fimpl%2FRemoteDeviceConnectorImplTest.java;h=051e2aae1b145d6ea67d5d6e1adccf5f33d85aa1;hb=86ea92e3769dc513b4c488726d318d939434eed7;hp=48dfab7f5f825f5bc0e1910b3614ed679b50ce01;hpb=651edfb5421fdab4244008dff950fac6710aeb6b;p=netconf.git diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java index 48dfab7f5f..051e2aae1b 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/RemoteDeviceConnectorImplTest.java @@ -10,15 +10,9 @@ package org.opendaylight.netconf.topology.singleton.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import static org.mockito.MockitoAnnotations.initMocks; -import static org.opendaylight.mdsal.common.api.CommitInfo.emptyFluentFuture; import akka.actor.ActorSystem; import akka.util.Timeout; @@ -29,13 +23,12 @@ import java.net.InetSocketAddress; import java.util.concurrent.ScheduledExecutorService; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.TransactionChain; -import org.opendaylight.mdsal.binding.api.TransactionChainListener; import org.opendaylight.mdsal.binding.api.WriteTransaction; -import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.mdsal.dom.api.DOMMountPointService; import org.opendaylight.mdsal.dom.api.DOMRpcProviderService; import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider; import org.opendaylight.netconf.client.NetconfClientDispatcher; @@ -49,8 +42,8 @@ import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCommun import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences; import org.opendaylight.netconf.sal.connect.netconf.sal.KeepaliveSalFacade; import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; -import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfConnectorDTO; import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologySetup; +import org.opendaylight.netconf.topology.spi.NetconfConnectorDTO; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; @@ -64,9 +57,11 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import scala.concurrent.duration.Duration; -public class RemoteDeviceConnectorImplTest { +@RunWith(MockitoJUnitRunner.StrictStubs.class) +public class RemoteDeviceConnectorImplTest extends AbstractBaseSchemasTest { private static final NodeId NODE_ID = new NodeId("testing-node"); private static final String TOPOLOGY_ID = "testing-topology"; @@ -96,9 +91,6 @@ public class RemoteDeviceConnectorImplTest { @Mock private NetconfClientDispatcher clientDispatcher; - @Mock - private DOMMountPointService mountPointService; - @Mock private TransactionChain txChain; @@ -113,34 +105,27 @@ public class RemoteDeviceConnectorImplTest { @Before public void setUp() { - initMocks(this); - remoteDeviceId = new RemoteDeviceId(TOPOLOGY_ID, new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999)); - doReturn(txChain).when(dataBroker).createTransactionChain(any(TransactionChainListener.class)); - doReturn(writeTx).when(txChain).newWriteOnlyTransaction(); - doNothing().when(writeTx).merge(eq(LogicalDatastoreType.OPERATIONAL), any(), any()); - doReturn("Some object").when(writeTx).getIdentifier(); - doReturn(emptyFluentFuture()).when(writeTx).commit(); - builder = new NetconfTopologySetup.NetconfTopologySetupBuilder(); - builder.setDataBroker(dataBroker); - builder.setRpcProviderRegistry(rpcProviderRegistry); - builder.setClusterSingletonServiceProvider(clusterSingletonServiceProvider); - builder.setKeepaliveExecutor(keepaliveExecutor); - builder.setProcessingExecutor(processingExecutor); - builder.setActorSystem(actorSystem); - builder.setEventExecutor(eventExecutor); - builder.setNetconfClientDispatcher(clientDispatcher); - builder.setTopologyId(TOPOLOGY_ID); + builder = new NetconfTopologySetup.NetconfTopologySetupBuilder() + .setBaseSchemas(BASE_SCHEMAS) + .setDataBroker(dataBroker) + .setRpcProviderRegistry(rpcProviderRegistry) + .setClusterSingletonServiceProvider(clusterSingletonServiceProvider) + .setKeepaliveExecutor(keepaliveExecutor) + .setProcessingExecutor(processingExecutor) + .setActorSystem(actorSystem) + .setEventExecutor(eventExecutor) + .setNetconfClientDispatcher(clientDispatcher) + .setTopologyId(TOPOLOGY_ID); } @SuppressWarnings("unchecked") @Test public void testStopRemoteDeviceConnection() { - final Credentials credentials = new LoginPasswordBuilder() - .setPassword("admin").setUsername("admin").build(); - final NetconfNode netconfNode = new NetconfNodeBuilder() + builder.setNode(new NodeBuilder().setNodeId(NODE_ID) + .addAugmentation(new NetconfNodeBuilder() .setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1")))) .setPort(new PortNumber(Uint16.valueOf(9999))) .setReconnectOnChangedSchema(true) @@ -148,12 +133,11 @@ public class RemoteDeviceConnectorImplTest { .setBetweenAttemptsTimeoutMillis(Uint16.valueOf(100)) .setSchemaless(false) .setTcpOnly(false) - .setCredentials(credentials) - .build(); - final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build(); - - builder.setNode(node); - + .setCredentials(new LoginPasswordBuilder() + .setPassword("admin").setUsername("admin") + .build()) + .build()) + .build()); final NetconfDeviceCommunicator communicator = mock(NetconfDeviceCommunicator.class); final RemoteDeviceHandler salFacade = mock(RemoteDeviceHandler.class); @@ -167,7 +151,6 @@ public class RemoteDeviceConnectorImplTest { verify(communicator, times(1)).close(); verify(salFacade, times(1)).close(); - } @SuppressWarnings("unchecked") @@ -187,9 +170,10 @@ public class RemoteDeviceConnectorImplTest { .setKeepaliveDelay(Uint32.ONE) .build(); - final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(NetconfNode.class, netconfNode).build(); + final Node node = new NodeBuilder().setNodeId(NODE_ID).addAugmentation(netconfNode).build(); - builder.setSchemaResourceDTO(new DefaultSchemaResourceManager().getSchemaResources(netconfNode, "foo")); + builder.setSchemaResourceDTO(new DefaultSchemaResourceManager(new DefaultYangParserFactory()) + .getSchemaResources(netconfNode, "foo")); final RemoteDeviceConnectorImpl remoteDeviceConnection = new RemoteDeviceConnectorImpl(builder.build(), remoteDeviceId, deviceActionFactory);