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%2Ftx%2FNetconfDeviceWriteOnlyTxTest.java;h=dcc473c99d35eae5a76be1c42b3f1b47dbe22400;hb=1dba5b2651d7fc60af0263cc0640d5ebeda8e454;hp=7d4dd0abaecdecf03333cf144653ea68b62599c2;hpb=5dc72744b99a4b88719d584cc32ed24a9c557533;p=netconf.git diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java index 7d4dd0abae..dcc473c99d 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/NetconfDeviceWriteOnlyTxTest.java @@ -5,153 +5,147 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.netconf.sal.connect.netconf.sal.tx; -import static org.junit.Assert.fail; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.junit.Assert.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.atMost; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; -import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_CANDIDATE_QNAME; +import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.DISCARD_CHANGES_RPC_CONTENT; +import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_CANDIDATE_NODEID; import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_FILTER_QNAME; -import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_RUNNING_QNAME; -import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.toPath; +import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_RUNNING_NODEID; -import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.net.InetSocketAddress; +import java.util.concurrent.ExecutionException; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.InOrder; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; -import org.opendaylight.controller.md.sal.dom.spi.DefaultDOMRpcResult; -import org.opendaylight.netconf.sal.connect.netconf.schema.mapping.BaseSchema; +import org.mockito.junit.MockitoJUnitRunner; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; +import org.opendaylight.netconf.sal.connect.api.RemoteDeviceId; +import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Rpcs; +import org.opendaylight.netconf.sal.connect.netconf.AbstractBaseSchemasTest; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps; import org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil; -import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState; -import org.opendaylight.yangtools.yang.common.RpcError; +import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext; +import org.opendaylight.yangtools.yang.common.ErrorTag; +import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaPath; -public class NetconfDeviceWriteOnlyTxTest { +@RunWith(MockitoJUnitRunner.StrictStubs.class) +public class NetconfDeviceWriteOnlyTxTest extends AbstractBaseSchemasTest { private final RemoteDeviceId id = new RemoteDeviceId("test-mount", new InetSocketAddress(99)); @Mock - private DOMRpcService rpc; + private Rpcs.Normalized rpc; private YangInstanceIdentifier yangIId; @Before - public void setUp() throws Exception { - MockitoAnnotations.initMocks(this); - - final CheckedFuture successFuture = - Futures.immediateCheckedFuture(new DefaultDOMRpcResult(((NormalizedNode) null))); + public void setUp() { + final ListenableFuture successFuture = + Futures.immediateFuture(new DefaultDOMRpcResult((ContainerNode) null)); doReturn(successFuture) - .doReturn(Futures.immediateFailedCheckedFuture(new IllegalStateException("Failed tx"))) + .doReturn(Futures.immediateFailedFuture(new IllegalStateException("Failed tx"))) .doReturn(successFuture) - .when(rpc).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); + .when(rpc).invokeNetconf(any(), any()); yangIId = YangInstanceIdentifier.builder().node(NetconfState.QNAME).build(); } @Test public void testIgnoreNonVisibleData() { - final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(SchemaContext.class)), + final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(MountPointContext.class)), false); final MapNode emptyList = ImmutableNodes.mapNodeBuilder(NETCONF_FILTER_QNAME).build(); - tx.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(NETCONF_FILTER_QNAME)), emptyList); - tx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.create(new YangInstanceIdentifier.NodeIdentifier(NETCONF_FILTER_QNAME)), emptyList); + tx.merge(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier + .create(new NodeIdentifier(NETCONF_FILTER_QNAME)), emptyList); + tx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier + .create(new NodeIdentifier(NETCONF_FILTER_QNAME)), emptyList); - verify(rpc, atMost(1)).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); + verify(rpc, atMost(1)).invokeNetconf(any(), any()); } @Test public void testDiscardChanges() { - final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(SchemaContext.class)), - false); - final CheckedFuture submitFuture = tx.submit(); - try { - submitFuture.checkedGet(); - } catch (final TransactionCommitFailedException e) { - // verify discard changes was sent - final InOrder inOrder = inOrder(rpc); - inOrder.verify(rpc).invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_LOCK_QNAME), NetconfBaseOps.getLockContent(NETCONF_CANDIDATE_QNAME)); - inOrder.verify(rpc).invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME), NetconfMessageTransformUtil.COMMIT_RPC_CONTENT); - inOrder.verify(rpc).invokeRpc(eq(toPath(NetconfMessageTransformUtil.NETCONF_DISCARD_CHANGES_QNAME)), any(NormalizedNode.class)); - inOrder.verify(rpc).invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_UNLOCK_QNAME), NetconfBaseOps.getUnLockContent(NETCONF_CANDIDATE_QNAME)); - return; - } - - fail("Submit should fail"); + final var future = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(MountPointContext.class)), false) + .commit(); + assertThrows(ExecutionException.class, () -> Futures.getDone(future)); + + // verify discard changes was sent + final InOrder inOrder = inOrder(rpc); + inOrder.verify(rpc).invokeNetconf(NetconfMessageTransformUtil.NETCONF_LOCK_QNAME, + NetconfBaseOps.getLockContent(NETCONF_CANDIDATE_NODEID)); + inOrder.verify(rpc).invokeNetconf(NetconfMessageTransformUtil.NETCONF_COMMIT_QNAME, + NetconfMessageTransformUtil.COMMIT_RPC_CONTENT); + inOrder.verify(rpc).invokeNetconf(NetconfMessageTransformUtil.NETCONF_DISCARD_CHANGES_QNAME, + DISCARD_CHANGES_RPC_CONTENT); + inOrder.verify(rpc).invokeNetconf(NetconfMessageTransformUtil.NETCONF_UNLOCK_QNAME, + NetconfBaseOps.getUnLockContent(NETCONF_CANDIDATE_NODEID)); } @Test - public void testFailedCommit() throws Exception { - final CheckedFuture rpcErrorFuture = - Futures.immediateCheckedFuture(new DefaultDOMRpcResult(RpcResultBuilder.newError(RpcError.ErrorType.APPLICATION, "a", "m"))); - - doReturn(Futures.immediateCheckedFuture(new DefaultDOMRpcResult(((NormalizedNode) null)))) - .doReturn(rpcErrorFuture).when(rpc).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); + public void testFailedCommit() { + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult((ContainerNode) null))) + .doReturn(Futures.immediateFuture(new DefaultDOMRpcResult(RpcResultBuilder.newError(ErrorType.APPLICATION, + new ErrorTag("a"), "m")))).when(rpc).invokeNetconf(any(), any()); - final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(SchemaContext.class)), - false); + final var future = new WriteCandidateTx(id, new NetconfBaseOps(rpc, mock(MountPointContext.class)), false) + .commit(); - final CheckedFuture submitFuture = tx.submit(); - try { - submitFuture.checkedGet(); - } catch (final TransactionCommitFailedException e) { - return; - } - - fail("Submit should fail"); + assertThrows(ExecutionException.class, () -> Futures.getDone(future)); } @Test public void testDiscardChangesNotSentWithoutCandidate() { - doReturn(Futures.immediateCheckedFuture(new DefaultDOMRpcResult((NormalizedNode) null))) - .doReturn(Futures.immediateFailedCheckedFuture(new IllegalStateException("Failed tx"))) - .when(rpc).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult((ContainerNode) null))) + .doReturn(Futures.immediateFailedFuture(new IllegalStateException("Failed tx"))) + .when(rpc).invokeNetconf(any(), any()); - final WriteRunningTx tx = new WriteRunningTx(id, new NetconfBaseOps(rpc, BaseSchema.BASE_NETCONF_CTX_WITH_NOTIFICATIONS.getSchemaContext()), - false); + final WriteRunningTx tx = new WriteRunningTx(id, + new NetconfBaseOps(rpc, BASE_SCHEMAS.getBaseSchemaWithNotifications().getMountPointContext()), false); tx.delete(LogicalDatastoreType.CONFIGURATION, yangIId); - tx.submit(); + tx.commit(); // verify discard changes was sent final InOrder inOrder = inOrder(rpc); - inOrder.verify(rpc).invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_LOCK_QNAME), NetconfBaseOps.getLockContent(NETCONF_RUNNING_QNAME)); - inOrder.verify(rpc).invokeRpc(eq(toPath(NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME)), any(NormalizedNode.class)); - inOrder.verify(rpc).invokeRpc(toPath(NetconfMessageTransformUtil.NETCONF_UNLOCK_QNAME), NetconfBaseOps.getUnLockContent(NETCONF_RUNNING_QNAME)); + inOrder.verify(rpc).invokeNetconf(NetconfMessageTransformUtil.NETCONF_LOCK_QNAME, + NetconfBaseOps.getLockContent(NETCONF_RUNNING_NODEID)); + inOrder.verify(rpc).invokeNetconf(eq(NetconfMessageTransformUtil.NETCONF_EDIT_CONFIG_QNAME), any()); + inOrder.verify(rpc).invokeNetconf(NetconfMessageTransformUtil.NETCONF_UNLOCK_QNAME, + NetconfBaseOps.getUnLockContent(NETCONF_RUNNING_NODEID)); } @Test public void testListenerSuccess() throws Exception { - doReturn(Futures.immediateCheckedFuture(new DefaultDOMRpcResult((NormalizedNode) null))) - .when(rpc).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); - final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, BaseSchema.BASE_NETCONF_CTX.getSchemaContext()), false); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult((ContainerNode) null))) + .when(rpc).invokeNetconf(any(), any()); + final WriteCandidateTx tx = new WriteCandidateTx( + id, new NetconfBaseOps(rpc, BASE_SCHEMAS.getBaseSchema().getMountPointContext()), false); final TxListener listener = mock(TxListener.class); tx.addListener(listener); tx.delete(LogicalDatastoreType.CONFIGURATION, yangIId); - tx.submit(); + tx.commit(); verify(listener).onTransactionSubmitted(tx); verify(listener).onTransactionSuccessful(tx); verify(listener, never()).onTransactionFailed(eq(tx), any()); @@ -160,9 +154,8 @@ public class NetconfDeviceWriteOnlyTxTest { @Test public void testListenerCancellation() throws Exception { - doReturn(Futures.immediateCheckedFuture(new DefaultDOMRpcResult((NormalizedNode) null))) - .when(rpc).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); - final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, BaseSchema.BASE_NETCONF_CTX.getSchemaContext()), false); + final WriteCandidateTx tx = new WriteCandidateTx( + id, new NetconfBaseOps(rpc, BASE_SCHEMAS.getBaseSchema().getMountPointContext()), false); final TxListener listener = mock(TxListener.class); tx.addListener(listener); tx.delete(LogicalDatastoreType.CONFIGURATION, yangIId); @@ -176,13 +169,13 @@ public class NetconfDeviceWriteOnlyTxTest { @Test public void testListenerFailure() throws Exception { final IllegalStateException cause = new IllegalStateException("Failed tx"); - doReturn(Futures.immediateFailedCheckedFuture(cause)) - .when(rpc).invokeRpc(any(SchemaPath.class), any(NormalizedNode.class)); - final WriteCandidateTx tx = new WriteCandidateTx(id, new NetconfBaseOps(rpc, BaseSchema.BASE_NETCONF_CTX.getSchemaContext()), false); + doReturn(Futures.immediateFailedFuture(cause)).when(rpc).invokeNetconf(any(), any()); + final WriteCandidateTx tx = new WriteCandidateTx( + id, new NetconfBaseOps(rpc, BASE_SCHEMAS.getBaseSchema().getMountPointContext()), false); final TxListener listener = mock(TxListener.class); tx.addListener(listener); tx.delete(LogicalDatastoreType.CONFIGURATION, yangIId); - tx.submit(); + tx.commit(); final ArgumentCaptor excCaptor = ArgumentCaptor.forClass(Exception.class); verify(listener).onTransactionSubmitted(tx); verify(listener).onTransactionFailed(eq(tx), excCaptor.capture());