import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.MockitoAnnotations.initMocks;
import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.DELETE;
import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.SUBTREE_MODIFIED;
import static org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType.WRITE;
import akka.testkit.TestActorRef;
import akka.testkit.javadsl.TestKit;
import akka.util.Timeout;
-import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
import com.google.common.io.ByteSource;
import com.google.common.util.concurrent.Futures;
import com.typesafe.config.ConfigFactory;
import java.net.InetSocketAddress;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.DataObjectModification;
import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.mdsal.dom.api.DOMActionService;
import org.opendaylight.mdsal.dom.api.DOMDataBroker;
import org.opendaylight.mdsal.dom.api.DOMMountPoint;
import org.opendaylight.mdsal.dom.api.DOMMountPointService;
import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.netconf.dom.api.NetconfDataTreeService;
import org.opendaylight.netconf.sal.connect.api.NetconfDeviceSchemasResolver;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceId;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Actions;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices.Rpcs;
import org.opendaylight.netconf.sal.connect.netconf.NetconfDevice;
-import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
+import org.opendaylight.netconf.sal.connect.netconf.sal.NetconfDeviceMount;
import org.opendaylight.netconf.topology.singleton.impl.actors.NetconfNodeActor;
import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologySetup;
import org.opendaylight.netconf.topology.singleton.impl.utils.NetconfTopologyUtils;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.ClusteredConnectionStatusBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.ConnectionOper.ConnectionStatus;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.device.rev221225.connection.oper.ClusteredConnectionStatusBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNode;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev221225.NetconfNodeBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.model.repo.api.EffectiveModelContextFactory;
-import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier;
import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource;
import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource;
*
* @author Thomas Pantelis
*/
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
public class NetconfNodeManagerTest extends AbstractBaseSchemasTest {
private static final String ACTOR_SYSTEM_NAME = "test";
private static final RemoteDeviceId DEVICE_ID = new RemoteDeviceId("device", new InetSocketAddress(65535));
- private static final List<SourceIdentifier> SOURCE_IDENTIFIERS =
- ImmutableList.of(RevisionSourceIdentifier.create("testID"));
+ private static final List<SourceIdentifier> SOURCE_IDENTIFIERS = List.of(new SourceIdentifier("testID"));
@Mock
private DOMMountPointService mockMountPointService;
private DOMDataBroker mockDeviceDataBroker;
@Mock
- private DOMRpcService mockRpcService;
+ private Rpcs.Normalized mockRpcService;
@Mock
- private DOMActionService mockActionService;
+ private Actions.Normalized mockActionService;
@Mock
private NetconfDeviceSchemasResolver mockSchemasResolver;
@Before
public void setup() {
- initMocks(this);
-
final Timeout responseTimeout = Timeout.apply(1, TimeUnit.SECONDS);
slaveSystem = ActorSystem.create(ACTOR_SYSTEM_NAME, ConfigFactory.load().getConfig("Slave"));
masterSchemaRepository.registerSchemaSourceListener(
TextToIRTransformer.create(masterSchemaRepository, masterSchemaRepository));
- String yangTemplate =
- "module ID {"
- + " namespace \"ID\";"
- + " prefix ID;"
- + "}";
+ final String yangTemplate = """
+ module ID {\
+ namespace "ID";\
+ prefix ID;\
+ }""";
SOURCE_IDENTIFIERS.stream().map(
sourceId -> masterSchemaRepository.registerSchemaSource(
id -> Futures.immediateFuture(YangTextSchemaSource.delegateForByteSource(id,
- ByteSource.wrap(yangTemplate.replaceAll("ID", id.getName()).getBytes(UTF_8)))),
+ ByteSource.wrap(yangTemplate.replaceAll("ID", id.name().getLocalName()).getBytes(UTF_8)))),
PotentialSchemaSource.create(sourceId, YangTextSchemaSource.class, 1)))
.collect(Collectors.toList());
testMasterActorRef = TestActorRef.create(masterSystem, Props.create(TestMasterActor.class, masterSetup,
DEVICE_ID, responseTimeout, mockMountPointService).withDispatcher(Dispatchers.DefaultDispatcherId()),
- NetconfTopologyUtils.createMasterActorName(DEVICE_ID.getName(), masterAddress));
+ NetconfTopologyUtils.createMasterActorName(DEVICE_ID.name(), masterAddress));
SharedSchemaRepository slaveSchemaRepository = new SharedSchemaRepository("slave");
slaveSchemaRepository.registerSchemaSourceListener(
doReturn(WRITE).when(mockDataObjModification).getModificationType();
doReturn(node).when(mockDataObjModification).getDataAfter();
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
verify(mockMountPointBuilder).addService(eq(DOMDataBroker.class), any());
verify(mockMountPointBuilder).addService(eq(DOMRpcService.class), any());
verify(mockMountPointBuilder).addService(eq(DOMNotificationService.class), any());
- verify(mockMountPointService).createMountPoint(DEVICE_ID.getTopologyPath());
+ verify(mockMountPointService).createMountPoint(NetconfDeviceMount.defaultTopologyMountPath(DEVICE_ID));
// Notify that the NetconfNode operational state was deleted. Expect the slave mount point closed.
doReturn(DELETE).when(mockDataObjModification).getModificationType();
- doReturn(node).when(mockDataObjModification).getDataBefore();
- doReturn(null).when(mockDataObjModification).getDataAfter();
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
doReturn(null).when(mockDataObjModification).getDataBefore();
doReturn(node).when(mockDataObjModification).getDataAfter();
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
doReturn(node).when(mockDataObjModification).getDataBefore();
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
// Notify that the NetconfNode operational state was changed to UnableToConnect. Expect the slave mount point
// closed.
- setupMountPointMocks();
+ reset(mockMountPointService, mockMountPointBuilder, mockMountPointReg);
+ doNothing().when(mockMountPointReg).close();
final Node updatedNode = new NodeBuilder().setNodeId(nodeId)
.addAugmentation(new NetconfNodeBuilder(netconfNode)
- .setConnectionStatus(NetconfNodeConnectionStatus.ConnectionStatus.UnableToConnect)
+ .setConnectionStatus(ConnectionStatus.UnableToConnect)
.build())
.build();
doReturn(node).when(mockDataObjModification).getDataBefore();
doReturn(updatedNode).when(mockDataObjModification).getDataAfter();
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
// First try the registration where the perceived master hasn't been initialized as the master.
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
testMasterActorRef.underlyingActor().messagesToDrop.put(YangTextSchemaSourceRequest.class,
yangTextSchemaSourceRequestFuture);
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
testMasterActorRef.underlyingActor().messagesToDrop.put(AskForMasterMountPoint.class,
askForMasterMountPointFuture);
- netconfNodeManager.onDataTreeChanged(Collections.singletonList(
+ netconfNodeManager.onDataTreeChanged(List.of(
new NetconfTopologyManagerTest.CustomTreeModification(DataTreeIdentifier.create(
LogicalDatastoreType.OPERATIONAL, nodeListPath), mockDataObjModification)));
verify(mockMountPointReg, timeout(5000)).close();
verify(mockMountPointBuilder, timeout(5000)).register();
- setupMountPointMocks();
+ reset(mockMountPointService, mockMountPointBuilder, mockMountPointReg);
+ doNothing().when(mockMountPointReg).close();
netconfNodeManager.close();
verify(mockMountPointReg, timeout(5000)).close();
}
return new NetconfNodeBuilder()
.setHost(new Host(new IpAddress(new Ipv4Address("127.0.0.1"))))
.setPort(new PortNumber(Uint16.valueOf(9999)))
- .setConnectionStatus(NetconfNodeConnectionStatus.ConnectionStatus.Connected)
+ .setConnectionStatus(ConnectionStatus.Connected)
.setClusteredConnectionStatus(new ClusteredConnectionStatusBuilder()
.setNetconfMasterNode(masterAddress).build())
.build();
private void setupMountPointMocks() {
reset(mockMountPointService, mockMountPointBuilder, mockMountPointReg);
-
doNothing().when(mockMountPointReg).close();
-
- doReturn(mockMountPointBuilder).when(mockMountPointBuilder).addService(any(), any());
doReturn(mockMountPointReg).when(mockMountPointBuilder).register();
-
doReturn(mockMountPointBuilder).when(mockMountPointService).createMountPoint(any());
}
private void initializeMaster() {
TestKit kit = new TestKit(masterSystem);
testMasterActorRef.tell(new CreateInitialMasterActorData(mockDeviceDataBroker, netconfService,
- SOURCE_IDENTIFIERS,
- mockRpcService, mockActionService), kit.getRef());
+ SOURCE_IDENTIFIERS, new RemoteDeviceServices(mockRpcService, mockActionService)), kit.getRef());
kit.expectMsgClass(MasterActorDataInitialized.class);
}
Code Review / netconf.git / blobdiff