X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fsal-netconf-connector%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fsal%2Fconnect%2Fnetconf%2Fsal%2FNetconfDeviceSalFacadeTest.java;h=15e28983456ae0d33dff9d5083a36240027b9af8;hb=e016165a2c2580a8759e6629b1cdb1950059e36a;hp=e833f556b858128172aae5c8f6b8c2d218bcae11;hpb=395db096ace74bcfc068e3b3277dbad975985619;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java index e833f556b8..15e2898345 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacadeTest.java @@ -11,7 +11,6 @@ package org.opendaylight.netconf.sal.connect.netconf.sal; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -36,6 +35,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.mdsal.dom.api.DOMRpcService; import org.opendaylight.netconf.dom.api.NetconfDataTreeService; +import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices; import org.opendaylight.netconf.sal.connect.netconf.NetconfDeviceSchema; import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCapabilities; import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences; @@ -113,15 +113,14 @@ public class NetconfDeviceSalFacadeTest { final var netconfSessionPreferences = NetconfSessionPreferences.fromStrings( List.of(NetconfMessageTransformUtil.NETCONF_CANDIDATE_URI.toString())); - final DOMRpcService deviceRpc = mock(DOMRpcService.class); + final var deviceServices = new RemoteDeviceServices(mock(DOMRpcService.class), null); deviceFacade.onDeviceConnected( new NetconfDeviceSchema(NetconfDeviceCapabilities.empty(), new EmptyMountPointContext(schemaContext)), - netconfSessionPreferences, deviceRpc, null); + netconfSessionPreferences, deviceServices); verifyConnectionStatusUpdate(ConnectionStatus.Connected); - verify(mountInstance, times(1)).onTopologyDeviceConnected(eq(schemaContext), - any(DOMDataBroker.class), any(NetconfDataTreeService.class), eq(deviceRpc), - any(NetconfDeviceNotificationService.class), isNull()); + verify(mountInstance, times(1)).onTopologyDeviceConnected(eq(schemaContext), eq(deviceServices), + any(DOMDataBroker.class), any(NetconfDataTreeService.class)); } @Test