*/
package org.opendaylight.netconf.sal.connect.netconf.sal;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.verify;
+import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_GET_CONFIG_QNAME;
import static org.opendaylight.netconf.sal.connect.netconf.util.NetconfMessageTransformUtil.NETCONF_GET_QNAME;
+import com.google.common.util.concurrent.Futures;
import java.net.InetSocketAddress;
-import java.util.Arrays;
+import java.util.List;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction;
import org.opendaylight.mdsal.dom.api.DOMDataTreeReadWriteTransaction;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult;
+import org.opendaylight.netconf.dom.api.tx.NetconfDOMDataBrokerFieldsExtension;
+import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadTransaction;
+import org.opendaylight.netconf.dom.api.tx.NetconfDOMFieldsReadWriteTransaction;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceId;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Rpcs;
import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences;
import org.opendaylight.netconf.sal.connect.netconf.sal.tx.AbstractWriteTx;
import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateRunningTx;
import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteCandidateTx;
import org.opendaylight.netconf.sal.connect.netconf.sal.tx.WriteRunningTx;
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.netconf.base._1._0.rev110601.IetfNetconfService;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.NetconfTcp;
-import org.opendaylight.yangtools.rcf8528.data.util.EmptyMountPointContext;
-import org.opendaylight.yangtools.util.concurrent.FluentFutures;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.netconf.monitoring.rev220718.NetconfTcp;
+import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
@RunWith(MockitoJUnitRunner.class)
private static EffectiveModelContext SCHEMA_CONTEXT;
@Mock
- private DOMRpcService rpcService;
+ private Rpcs.Normalized rpcService;
private NetconfDeviceDataBroker dataBroker;
@BeforeClass
@Before
public void setUp() throws Exception {
- doReturn(FluentFutures.immediateFluentFuture(new DefaultDOMRpcResult())).when(rpcService)
- .invokeRpc(any(QName.class), any(ContainerNode.class));
+ doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(rpcService).invokeNetconf(any(), any());
dataBroker = getDataBroker(NetconfMessageTransformUtil.NETCONF_CANDIDATE_URI.toString());
}
@Test
- public void testNewReadOnlyTransaction() throws Exception {
+ public void testNewReadOnlyTransaction() {
final DOMDataTreeReadTransaction tx = dataBroker.newReadOnlyTransaction();
tx.read(LogicalDatastoreType.OPERATIONAL, null);
- verify(rpcService).invokeRpc(eq(NETCONF_GET_QNAME), any(ContainerNode.class));
+ verify(rpcService).invokeNetconf(eq(NETCONF_GET_QNAME), any());
}
@Test
- public void testNewReadWriteTransaction() throws Exception {
+ public void testNewReadWriteTransaction() {
final DOMDataTreeReadWriteTransaction tx = dataBroker.newReadWriteTransaction();
tx.read(LogicalDatastoreType.OPERATIONAL, null);
- verify(rpcService).invokeRpc(eq(NETCONF_GET_QNAME), any(ContainerNode.class));
+ verify(rpcService).invokeNetconf(eq(NETCONF_GET_QNAME), any());
}
@Test
- public void testWritableRunningCandidateWriteTransaction() throws Exception {
- testWriteTransaction(
- WriteCandidateRunningTx.class, NetconfMessageTransformUtil.NETCONF_RUNNING_WRITABLE_URI.toString(),
- NetconfMessageTransformUtil.NETCONF_CANDIDATE_URI.toString());
+ public void testWritableRunningCandidateWriteTransaction() {
+ testWriteTransaction(WriteCandidateRunningTx.class,
+ NetconfMessageTransformUtil.NETCONF_RUNNING_WRITABLE_URI.toString(),
+ NetconfMessageTransformUtil.NETCONF_CANDIDATE_URI.toString());
}
@Test
- public void testCandidateWriteTransaction() throws Exception {
+ public void testCandidateWriteTransaction() {
testWriteTransaction(WriteCandidateTx.class, NetconfMessageTransformUtil.NETCONF_CANDIDATE_URI.toString());
}
@Test
- public void testRunningWriteTransaction() throws Exception {
+ public void testRunningWriteTransaction() {
testWriteTransaction(WriteRunningTx.class, NetconfMessageTransformUtil.NETCONF_RUNNING_WRITABLE_URI.toString());
}
+ @Test
+ public void testDOMFieldsExtensions() {
+ final NetconfDOMDataBrokerFieldsExtension fieldsExtension = dataBroker.getExtensions().getInstance(
+ NetconfDOMDataBrokerFieldsExtension.class);
+ assertNotNull(fieldsExtension);
+
+ // read-only transaction
+ final NetconfDOMFieldsReadTransaction roTx = fieldsExtension.newReadOnlyTransaction();
+ roTx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(),
+ List.of(YangInstanceIdentifier.empty()));
+ verify(rpcService).invokeNetconf(Mockito.eq(NETCONF_GET_CONFIG_QNAME), any());
+
+ // read-write transaction
+ final NetconfDOMFieldsReadWriteTransaction rwTx = fieldsExtension.newReadWriteTransaction();
+ rwTx.read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty(),
+ List.of(YangInstanceIdentifier.empty()));
+ verify(rpcService).invokeNetconf(Mockito.eq(NETCONF_GET_QNAME), any());
+ }
+
private void testWriteTransaction(final Class<? extends AbstractWriteTx> transaction,
final String... capabilities) {
NetconfDeviceDataBroker db = getDataBroker(capabilities);
- Assert.assertEquals(transaction, db.newWriteOnlyTransaction().getClass());
+ assertEquals(transaction, db.newWriteOnlyTransaction().getClass());
}
private NetconfDeviceDataBroker getDataBroker(final String... caps) {
- NetconfSessionPreferences prefs = NetconfSessionPreferences.fromStrings(Arrays.asList(caps));
+ NetconfSessionPreferences prefs = NetconfSessionPreferences.fromStrings(List.of(caps));
final RemoteDeviceId id =
new RemoteDeviceId("device-1", InetSocketAddress.createUnresolved("localhost", 17830));
- return new NetconfDeviceDataBroker(id, new EmptyMountPointContext(SCHEMA_CONTEXT), rpcService, prefs);
+ return new NetconfDeviceDataBroker(id, new EmptyMountPointContext(SCHEMA_CONTEXT), rpcService, prefs, true);
}
-
}
Code Review / netconf.git / blobdiff