Migrate netconf-topology to new transport

[netconf.git] / apps / netconf-topology-singleton / src / test / java / org / opendaylight / netconf / topology / singleton / impl / MountPointEndToEndTest.java

diff --git a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
index a5cee5177a9f50327d4f637e8916fee7a21758e9..477f85bde951957363d1e1adb0d408aa06d17ddf 100644 (file)
--- a/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
+++ b/apps/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/MountPointEndToEndTest.java
@@ -34,7 +34,6 @@ import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
 import com.typesafe.config.ConfigFactory;
 import io.netty.util.concurrent.EventExecutor;
-import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GlobalEventExecutor;
 import java.io.File;
 import java.util.Iterator;
@@ -93,7 +92,7 @@ import org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceRegist
 import org.opendaylight.mdsal.singleton.common.api.ServiceGroupIdentifier;
 import org.opendaylight.mdsal.singleton.dom.impl.DOMClusterSingletonServiceProviderImpl;
 import org.opendaylight.netconf.api.CapabilityURN;
-import org.opendaylight.netconf.client.NetconfClientDispatcher;
+import org.opendaylight.netconf.client.NetconfClientFactory;
 import org.opendaylight.netconf.client.mdsal.NetconfDeviceCapabilities;
 import org.opendaylight.netconf.client.mdsal.NetconfDeviceSchema;
 import org.opendaylight.netconf.client.mdsal.api.CredentialProvider;
@@ -186,7 +185,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
 
     @Mock private RpcProviderService mockRpcProviderService;
     @Mock private Registration mockRpcReg;
-    @Mock private NetconfClientDispatcher mockClientDispatcher;
+    @Mock private NetconfClientFactory mockClientFactory;
     @Mock private AAAEncryptionService mockEncryptionService;
     @Mock private ScheduledExecutorService mockKeepaliveExecutor;
     @Mock private DeviceActionFactory deviceActionFactory;
@@ -271,7 +270,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
         setupSlave();
 
         yangNodeInstanceId = bindingToNormalized.toYangInstanceIdentifier(NODE_INSTANCE_ID);
-        doReturn(mock(Future.class)).when(mockClientDispatcher).createClient(any());
+        doReturn(mock(ListenableFuture.class)).when(mockClientFactory).createClient(any());
 
         LOG.info("****** Setup complete");
     }
@@ -308,7 +307,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
 
         masterNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, masterDataBroker,
                 masterClusterSingletonServiceProvider, mockKeepaliveExecutor, MoreExecutors.directExecutor(),
-                masterSystem, eventExecutor, mockClientDispatcher, masterMountPointService,
+                masterSystem, eventExecutor, mockClientFactory, masterMountPointService,
                 mockEncryptionService, mockRpcProviderService, deviceActionFactory, resourceManager, builderFactory,
                 TOPOLOGY_ID, Uint16.ZERO) {
             @Override
@@ -345,7 +344,7 @@ public class MountPointEndToEndTest extends AbstractBaseSchemasTest {
 
         slaveNetconfTopologyManager = new NetconfTopologyManager(BASE_SCHEMAS, slaveDataBroker,
                 mockSlaveClusterSingletonServiceProvider, mockKeepaliveExecutor, MoreExecutors.directExecutor(),
-                slaveSystem, eventExecutor, mockClientDispatcher, slaveMountPointService,
+                slaveSystem, eventExecutor, mockClientFactory, slaveMountPointService,
                 mockEncryptionService, mockRpcProviderService, deviceActionFactory, resourceManager, builderFactory,
                 TOPOLOGY_ID, Uint16.ZERO) {
             @Override