Teach NETCONF about YANG 1.1 actions in cluster topology

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

diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/TestingRemoteDeviceConnectorImpl.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/TestingRemoteDeviceConnectorImpl.java
index 780b14e86f58632b0a96198f65862b737ab67c5f..8b630829ec9b547b944b0f356e3302891d23c3b2 100644 (file)
--- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/TestingRemoteDeviceConnectorImpl.java
+++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/TestingRemoteDeviceConnectorImpl.java
@@ -8,40 +8,38 @@
 
 package org.opendaylight.netconf.topology.singleton.impl;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 
-import akka.actor.ActorRef;
-import com.google.common.util.concurrent.Futures;
+import org.opendaylight.netconf.sal.connect.api.DeviceActionFactory;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
 import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCommunicator;
+import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences;
 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.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 
 class TestingRemoteDeviceConnectorImpl extends RemoteDeviceConnectorImpl {
 
     private final NetconfDeviceCommunicator communicator;
-    private final RemoteDeviceHandler salFacade;
 
     TestingRemoteDeviceConnectorImpl(final NetconfTopologySetup netconfTopologyDeviceSetup,
-                                            final RemoteDeviceId remoteDeviceId,
-                                            final NetconfDeviceCommunicator communicator,
-                                            final RemoteDeviceHandler salFacade) {
-        super(netconfTopologyDeviceSetup, remoteDeviceId);
+                                     final RemoteDeviceId remoteDeviceId,
+                                     final NetconfDeviceCommunicator communicator,
+                                     final DeviceActionFactory deviceActionFactory) {
+        super(netconfTopologyDeviceSetup, remoteDeviceId, deviceActionFactory);
+
         this.communicator = communicator;
-        this.salFacade = salFacade;
     }
 
     @Override
     public NetconfConnectorDTO createDeviceCommunicator(final NodeId nodeId, final NetconfNode node,
-                                                        final ActorRef deviceContextActorRef) {
-
+            RemoteDeviceHandler<NetconfSessionPreferences> salFacade) {
         final NetconfConnectorDTO connectorDTO = new NetconfConnectorDTO(communicator, salFacade);
-        doReturn(Futures.immediateCheckedFuture(null)).when(communicator).initializeRemoteConnection(any(), any());
+        doReturn(FluentFutures.immediateNullFluentFuture()).when(communicator).initializeRemoteConnection(any(), any());
         return connectorDTO;
     }
-
 }