Create RemoteDeviceServices.{Actions,Rpcs}

[netconf.git] / netconf / sal-netconf-connector / src / test / java / org / opendaylight / netconf / sal / connect / netconf / sal / KeepaliveSalFacadeTest.java

diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java
index 24c7265dae2fa22dba5bcf3f42696f0aa0a0230a..7549333f76d57b0d03d1e49bc783b232d251559f 100644 (file)
--- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java
+++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/KeepaliveSalFacadeTest.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.netconf.sal.connect.netconf.sal;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doAnswer;
@@ -17,6 +19,7 @@ import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
+import com.google.common.util.concurrent.Futures;
 import java.net.InetSocketAddress;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -26,14 +29,13 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
 import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
 import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Rpcs;
 import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCommunicator;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
-import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -41,23 +43,19 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
 
 @RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class KeepaliveSalFacadeTest {
-
     private static final RemoteDeviceId REMOTE_DEVICE_ID =
             new RemoteDeviceId("test", new InetSocketAddress("localhost", 22));
 
     @Mock
     private RemoteDeviceHandler underlyingSalFacade;
-
-    private ScheduledExecutorService executorServiceSpy;
-
     @Mock
     private NetconfDeviceCommunicator listener;
     @Mock
-    private DOMRpcService deviceRpc;
-
-    private DOMRpcService proxyRpc;
+    private Rpcs.Normalized deviceRpc;
 
+    private ScheduledExecutorService executorServiceSpy;
     private KeepaliveSalFacade keepaliveSalFacade;
+    private Rpcs proxyRpc;
 
     @Before
     public void setUp() throws Exception {
@@ -78,23 +76,22 @@ public class KeepaliveSalFacadeTest {
 
     @Test
     public void testKeepaliveSuccess() throws Exception {
-        doReturn(FluentFutures.immediateFluentFuture(new DefaultDOMRpcResult(Builders.containerBuilder()
+        doReturn(Futures.immediateFuture(new DefaultDOMRpcResult(Builders.containerBuilder()
             .withNodeIdentifier(NetconfMessageTransformUtil.NETCONF_RUNNING_NODEID)
-            .build()))).when(deviceRpc).invokeRpc(any(QName.class), any(ContainerNode.class));
+            .build()))).when(deviceRpc).invokeNetconf(any(), any());
 
         final var services = new RemoteDeviceServices(deviceRpc, null);
         keepaliveSalFacade.onDeviceConnected(null, null, services);
 
         verify(underlyingSalFacade).onDeviceConnected(isNull(), isNull(), any(RemoteDeviceServices.class));
 
-        verify(deviceRpc, timeout(15000).times(5)).invokeRpc(any(QName.class), any(ContainerNode.class));
+        verify(deviceRpc, timeout(15000).times(5)).invokeNetconf(any(), any());
     }
 
     @Test
     public void testKeepaliveRpcFailure() {
-
-        doReturn(FluentFutures.immediateFailedFluentFuture(new IllegalStateException("illegal-state")))
-                .when(deviceRpc).invokeRpc(any(QName.class), any(ContainerNode.class));
+        doReturn(Futures.immediateFailedFuture(new IllegalStateException("illegal-state")))
+                .when(deviceRpc).invokeNetconf(any(), any());
 
         keepaliveSalFacade.onDeviceConnected(null, null, new RemoteDeviceServices(deviceRpc, null));
 
@@ -102,7 +99,7 @@ public class KeepaliveSalFacadeTest {
 
         // Should disconnect the session
         verify(listener, timeout(15000).times(1)).disconnect();
-        verify(deviceRpc, times(1)).invokeRpc(any(QName.class), any(ContainerNode.class));
+        verify(deviceRpc, times(1)).invokeNetconf(any(), any());
     }
 
     @Test
@@ -110,8 +107,7 @@ public class KeepaliveSalFacadeTest {
 
         final var rpcSuccessWithError = new DefaultDOMRpcResult(mock(RpcError.class));
 
-        doReturn(FluentFutures.immediateFluentFuture(rpcSuccessWithError))
-                .when(deviceRpc).invokeRpc(any(QName.class), any(ContainerNode.class));
+        doReturn(Futures.immediateFuture(rpcSuccessWithError)).when(deviceRpc).invokeNetconf(any(), any());
 
         keepaliveSalFacade.onDeviceConnected(null, null, new RemoteDeviceServices(deviceRpc, null));
 
@@ -119,7 +115,7 @@ public class KeepaliveSalFacadeTest {
 
         // Shouldn't disconnect the session
         verify(listener, times(0)).disconnect();
-        verify(deviceRpc, timeout(15000).times(1)).invokeRpc(any(QName.class), any(ContainerNode.class));
+        verify(deviceRpc, timeout(15000).times(1)).invokeNetconf(any(), any());
     }
 
     @Test
@@ -127,8 +123,8 @@ public class KeepaliveSalFacadeTest {
         doAnswer(invocation -> proxyRpc = invocation.getArgument(2, RemoteDeviceServices.class).rpcs())
                 .when(underlyingSalFacade).onDeviceConnected(isNull(), isNull(), any(RemoteDeviceServices.class));
 
-        doReturn(FluentFutures.immediateFailedFluentFuture(new IllegalStateException("illegal-state")))
-                .when(deviceRpc).invokeRpc(any(QName.class), any(ContainerNode.class));
+        doReturn(Futures.immediateFailedFuture(new IllegalStateException("illegal-state")))
+                .when(deviceRpc).invokeRpc(any(), any());
 
         keepaliveSalFacade =
                 new KeepaliveSalFacade(REMOTE_DEVICE_ID, underlyingSalFacade, executorServiceSpy, 100L, 1L);
@@ -136,7 +132,8 @@ public class KeepaliveSalFacadeTest {
 
         keepaliveSalFacade.onDeviceConnected(null, null, new RemoteDeviceServices(deviceRpc, null));
 
-        proxyRpc.invokeRpc(QName.create("foo", "bar"), mock(ContainerNode.class));
+        assertThat(proxyRpc, instanceOf(Rpcs.Normalized.class));
+        ((Rpcs.Normalized) proxyRpc).invokeRpc(QName.create("foo", "bar"), mock(ContainerNode.class));
 
         verify(listener, times(1)).disconnect();
     }