*/
package org.opendaylight.netconf.sal.connect.netconf.sal;
+import static java.util.Objects.requireNonNull;
+
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Lists;
-import java.util.ArrayList;
-import java.util.List;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-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.DOMMountPointService;
import org.opendaylight.mdsal.dom.api.DOMNotification;
-import org.opendaylight.mdsal.dom.api.DOMRpcService;
import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
-import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCapabilities;
+import org.opendaylight.netconf.sal.connect.api.RemoteDeviceServices;
+import org.opendaylight.netconf.sal.connect.netconf.NetconfDeviceSchema;
import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences;
import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.NetconfNodeFieldsOptional;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.netconf.node.fields.optional.Topology;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.netconf.node.fields.optional.TopologyKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.netconf.node.fields.optional.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.netconf.node.fields.optional.topology.NodeKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.netconf.node.fields.optional.topology.node.DatastoreLock;
-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.NetconfNodeConnectionStatus.ConnectionStatus;
-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.TopologyId;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class NetconfDeviceSalFacade implements AutoCloseable, RemoteDeviceHandler<NetconfSessionPreferences> {
-
- private static final Logger LOG = LoggerFactory.getLogger(NetconfDeviceSalFacade.class);
+public class NetconfDeviceSalFacade implements RemoteDeviceHandler, AutoCloseable {
private final RemoteDeviceId id;
- private final NetconfDeviceSalProvider salProvider;
- private final List<AutoCloseable> salRegistrations = new ArrayList<>();
- private final DataBroker dataBroker;
- private final String topologyId;
-
- private ListenerRegistration<LockChangeListener> listenerRegistration = null;
+ private final NetconfDeviceMount mount;
+ private final boolean lockDatastore;
public NetconfDeviceSalFacade(final RemoteDeviceId id, final DOMMountPointService mountPointService,
- final DataBroker dataBroker, final String topologyId) {
- this(id, new NetconfDeviceSalProvider(id, mountPointService, dataBroker), dataBroker, topologyId);
+ final boolean lockDatastore) {
+ this(id, new NetconfDeviceMount(mountPointService, id), lockDatastore);
}
@VisibleForTesting
- NetconfDeviceSalFacade(final RemoteDeviceId id, final NetconfDeviceSalProvider salProvider,
- final DataBroker dataBroker, final String topologyId) {
- this.id = id;
- this.salProvider = salProvider;
- this.dataBroker = dataBroker;
- this.topologyId = topologyId;
+ NetconfDeviceSalFacade(final RemoteDeviceId id, final NetconfDeviceMount mount, final boolean lockDatastore) {
+ this.id = requireNonNull(id);
+ this.mount = requireNonNull(mount);
+ this.lockDatastore = lockDatastore;
}
@Override
public synchronized void onNotification(final DOMNotification domNotification) {
- salProvider.getMountInstance().publish(domNotification);
+ mount.publish(domNotification);
}
@Override
- public synchronized void onDeviceConnected(final MountPointContext mountContext,
- final NetconfSessionPreferences netconfSessionPreferences,
- final DOMRpcService deviceRpc, final DOMActionService deviceAction) {
- final EffectiveModelContext schemaContext = mountContext.getEffectiveModelContext();
- final NetconfDeviceDataBroker netconfDeviceDataBroker =
- new NetconfDeviceDataBroker(id, mountContext, deviceRpc, netconfSessionPreferences);
- registerLockListener(netconfDeviceDataBroker);
- final NetconfDeviceNotificationService notificationService = new NetconfDeviceNotificationService();
+ public synchronized void onDeviceConnected(final NetconfDeviceSchema deviceSchema,
+ final NetconfSessionPreferences sessionPreferences, final RemoteDeviceServices services) {
+ final var mountContext = deviceSchema.mountContext();
+ final var modelContext = mountContext.getEffectiveModelContext();
- salProvider.getMountInstance()
- .onTopologyDeviceConnected(schemaContext, netconfDeviceDataBroker, deviceRpc, notificationService,
- deviceAction);
- salProvider.getTopologyDatastoreAdapter()
- .updateDeviceData(true, netconfSessionPreferences.getNetconfDeviceCapabilities());
- }
+ final var deviceRpc = services.rpcs();
- @Override
- public synchronized void onDeviceReconnected(final NetconfSessionPreferences netconfSessionPreferences,
- final NetconfNode node) {
- this.salProvider.getTopologyDatastoreAdapter().updateDeviceData(ConnectionStatus.Connecting,
- netconfSessionPreferences.getNetconfDeviceCapabilities(), LogicalDatastoreType.CONFIGURATION, node);
+ final var netconfDataTree = AbstractNetconfDataTreeService.of(id, mountContext, deviceRpc, sessionPreferences,
+ lockDatastore);
+ final var netconfDataBroker = new NetconfDeviceDataBroker(id, mountContext, deviceRpc, sessionPreferences,
+ lockDatastore);
+
+ mount.onDeviceConnected(modelContext, services, netconfDataBroker, netconfDataTree);
}
@Override
public synchronized void onDeviceDisconnected() {
- salProvider.getTopologyDatastoreAdapter().updateDeviceData(false, new NetconfDeviceCapabilities());
- salProvider.getMountInstance().onTopologyDeviceDisconnected();
- closeLockChangeListener();
+ mount.onDeviceDisconnected();
}
@Override
public synchronized void onDeviceFailed(final Throwable throwable) {
- salProvider.getTopologyDatastoreAdapter().setDeviceAsFailed(throwable);
- salProvider.getMountInstance().onTopologyDeviceDisconnected();
- closeLockChangeListener();
+ mount.onDeviceDisconnected();
}
@Override
public synchronized void close() {
- for (final AutoCloseable reg : Lists.reverse(salRegistrations)) {
- closeGracefully(reg);
- }
- closeGracefully(salProvider);
- closeLockChangeListener();
- }
-
- @SuppressWarnings("checkstyle:IllegalCatch")
- private void closeGracefully(final AutoCloseable resource) {
- if (resource != null) {
- try {
- resource.close();
- } catch (final Exception e) {
- LOG.warn("{}: Ignoring exception while closing {}", id, resource, e);
- }
- }
- }
-
- private void closeLockChangeListener() {
- if (listenerRegistration != null) {
- listenerRegistration.close();
- }
- }
-
- private void registerLockListener(final NetconfDeviceDataBroker netconfDeviceDataBroker) {
- listenerRegistration = dataBroker.registerDataTreeChangeListener(
- DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, createTopologyListPath()),
- new LockChangeListener(netconfDeviceDataBroker));
- }
-
- private InstanceIdentifier<DatastoreLock> createTopologyListPath() {
- return InstanceIdentifier.create(NetconfNodeFieldsOptional.class)
- .child(Topology.class, new TopologyKey(new TopologyId(topologyId)))
- .child(Node.class, new NodeKey(new NodeId(id.getName())))
- .child(DatastoreLock.class);
-
+ mount.close();
}
}
Code Review / netconf.git / blobdiff