import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
-import io.netty.util.concurrent.EventExecutor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.LinkedList;
import java.util.List;
import java.util.Objects;
-import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.checkerframework.checker.lock.qual.GuardedBy;
import org.opendaylight.mdsal.dom.api.DOMRpcResult;
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.notifications.rev120206.NetconfCapabilityChange;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.optional.rev190614.NetconfNodeAugmentedOptional;
-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.netconf.node.connection.status.available.capabilities.AvailableCapabilityBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.connection.status.unavailable.capabilities.UnavailableCapability;
+import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.rfc8528.data.api.MountPointContext;
import org.opendaylight.yangtools.rfc8528.data.util.EmptyMountPointContext;
import org.opendaylight.yangtools.rfc8528.model.api.SchemaMountConstants;
import org.opendaylight.yangtools.yang.model.repo.api.SchemaResolutionException;
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;
-import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider;
-import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistration;
import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* This is a mediator between NetconfDeviceCommunicator and NetconfDeviceSalFacade.
*/
-public class NetconfDevice implements RemoteDevice<NetconfSessionPreferences, NetconfDeviceCommunicator> {
+public class NetconfDevice implements RemoteDevice<NetconfDeviceCommunicator> {
private static final Logger LOG = LoggerFactory.getLogger(NetconfDevice.class);
private static final QName RFC8528_SCHEMA_MOUNTS_QNAME = QName.create(
protected final SchemaSourceRegistry schemaRegistry;
protected final SchemaRepository schemaRepository;
- protected final List<SchemaSourceRegistration<?>> sourceRegistrations = new ArrayList<>();
+ protected final List<Registration> sourceRegistrations = new ArrayList<>();
- private final RemoteDeviceHandler<NetconfSessionPreferences> salFacade;
+ private final RemoteDeviceHandler salFacade;
private final ListeningExecutorService processingExecutor;
private final DeviceActionFactory deviceActionFactory;
private final NetconfDeviceSchemasResolver stateSchemasResolver;
private final NotificationHandler notificationHandler;
private final boolean reconnectOnSchemasChange;
private final BaseNetconfSchemas baseSchemas;
- private final NetconfNode node;
- private final EventExecutor eventExecutor;
- private final NetconfNodeAugmentedOptional nodeOptional;
@GuardedBy("this")
private boolean connected = false;
private MessageTransformer messageTransformer;
public NetconfDevice(final SchemaResourcesDTO schemaResourcesDTO, final BaseNetconfSchemas baseSchemas,
- final RemoteDeviceId id, final RemoteDeviceHandler<NetconfSessionPreferences> salFacade,
+ final RemoteDeviceId id, final RemoteDeviceHandler salFacade,
final ListeningExecutorService globalProcessingExecutor, final boolean reconnectOnSchemasChange) {
- this(schemaResourcesDTO, baseSchemas, id, salFacade, globalProcessingExecutor, reconnectOnSchemasChange, null,
- null, null, null);
+ this(schemaResourcesDTO, baseSchemas, id, salFacade, globalProcessingExecutor, reconnectOnSchemasChange, null);
}
public NetconfDevice(final SchemaResourcesDTO schemaResourcesDTO, final BaseNetconfSchemas baseSchemas,
- final RemoteDeviceId id, final RemoteDeviceHandler<NetconfSessionPreferences> salFacade,
+ final RemoteDeviceId id, final RemoteDeviceHandler salFacade,
final ListeningExecutorService globalProcessingExecutor, final boolean reconnectOnSchemasChange,
- final DeviceActionFactory deviceActionFactory, final NetconfNode node, final EventExecutor eventExecutor,
- final NetconfNodeAugmentedOptional nodeOptional) {
+ final DeviceActionFactory deviceActionFactory) {
this.baseSchemas = requireNonNull(baseSchemas);
this.id = id;
this.reconnectOnSchemasChange = reconnectOnSchemasChange;
this.deviceActionFactory = deviceActionFactory;
- this.node = node;
- this.eventExecutor = eventExecutor;
- this.nodeOptional = nodeOptional;
schemaRegistry = schemaResourcesDTO.getSchemaRegistry();
schemaRepository = schemaResourcesDTO.getSchemaRepository();
schemaContextFactory = schemaResourcesDTO.getSchemaContextFactory();
@Override
public void onFailure(final Throwable cause) {
LOG.warn("{}: Unexpected error resolving device sources", id, cause);
-
- // No more sources, fail or try to reconnect
- if (cause instanceof EmptySchemaContextException) {
- if (nodeOptional != null && nodeOptional.getIgnoreMissingSchemaSources().getAllowed()) {
- eventExecutor.schedule(() -> {
- LOG.warn("Reconnection is allowed! This can lead to unexpected errors at runtime.");
- LOG.warn("{} : No more sources for schema context.", id);
- LOG.info("{} : Try to remount device.", id);
- onRemoteSessionDown();
- salFacade.onDeviceReconnected(remoteSessionCapabilities, node);
- }, nodeOptional.getIgnoreMissingSchemaSources().getReconnectTime().toJava(),
- TimeUnit.MILLISECONDS);
- return;
- }
- }
-
+ // FIXME: this causes salFacade to see onDeviceDisconnected() and then onDeviceFailed(), which is quite
+ // weird
handleSalInitializationFailure(cause, listener);
salFacade.onDeviceFailed(cause);
}
// Only disconnect is enough,
// the reconnecting nature of the connector will take care of reconnecting
listener.disconnect();
- return Optional.empty();
+ return false;
}
- return Optional.of(notification);
+ return true;
});
}
private ListenableFuture<EffectiveModelContext> assembleSchemaContext(final DeviceSources deviceSources,
final NetconfSessionPreferences remoteSessionCapabilities) {
LOG.debug("{}: Resolved device sources to {}", id, deviceSources);
- final SchemaSourceProvider<YangTextSchemaSource> yangProvider = deviceSources.getSourceProvider();
- for (final SourceIdentifier sourceId : deviceSources.getProvidedSources()) {
- sourceRegistrations.add(schemaRegistry.registerSchemaSource(yangProvider,
- PotentialSchemaSource.create(sourceId, YangTextSchemaSource.class,
- PotentialSchemaSource.Costs.REMOTE_IO.getValue())));
- }
+
+ sourceRegistrations.addAll(deviceSources.register(schemaRegistry));
return new SchemaSetup(deviceSources, remoteSessionCapabilities).startResolution();
}
notificationHandler.onRemoteSchemaDown();
salFacade.onDeviceDisconnected();
- sourceRegistrations.forEach(SchemaSourceRegistration::close);
+ sourceRegistrations.forEach(Registration::close);
sourceRegistrations.clear();
resetMessageTransformer();
}
}
/**
- * A dedicated exception to indicate when we fail to setup a SchemaContext.
- *
- * @author Robert Varga
+ * A dedicated exception to indicate when we fail to setup an {@link EffectiveModelContext}.
*/
- private static final class EmptySchemaContextException extends Exception {
+ public static final class EmptySchemaContextException extends Exception {
private static final long serialVersionUID = 1L;
- EmptySchemaContextException(final String message) {
+ public EmptySchemaContextException(final String message) {
super(message);
}
}
}
}
- private Collection<SourceIdentifier> filterMissingSources(final Collection<SourceIdentifier> origSources) {
+ private List<SourceIdentifier> filterMissingSources(final Collection<SourceIdentifier> origSources) {
return origSources.parallelStream().filter(sourceIdentifier -> {
try {
schemaRepository.getSchemaSource(sourceIdentifier, YangTextSchemaSource.class).get();
}).collect(Collectors.toList());
}
- private Collection<SourceIdentifier> handleMissingSchemaSourceException(
+ private List<SourceIdentifier> handleMissingSchemaSourceException(
final MissingSchemaSourceException exception) {
// In case source missing, try without it
final SourceIdentifier missingSource = exception.getSourceId();
return resolutionException.getResolvedSources();
}
- private Collection<SourceIdentifier> stripUnavailableSource(final SourceIdentifier sourceIdToRemove) {
- final LinkedList<SourceIdentifier> sourceIdentifiers = new LinkedList<>(requiredSources);
- checkState(sourceIdentifiers.remove(sourceIdToRemove),
- "%s: Trying to remove %s from %s failed", id, sourceIdToRemove, requiredSources);
- return sourceIdentifiers;
+ private List<SourceIdentifier> stripUnavailableSource(final SourceIdentifier sourceIdToRemove) {
+ final var tmp = new ArrayList<>(requiredSources);
+ checkState(tmp.remove(sourceIdToRemove), "%s: Trying to remove %s from %s failed", id, sourceIdToRemove,
+ requiredSources);
+ return tmp;
}
private Collection<QName> getQNameFromSourceIdentifiers(final Collection<SourceIdentifier> identifiers) {
Code Review / netconf.git / blobdiff