Remove duplicated code 17/46217/5
authorAndrej Mak <andrej.mak@pantheon.tech>
Tue, 27 Sep 2016 07:18:19 +0000 (09:18 +0200)
committerAndrej Mak <andrej.mak@pantheon.tech>
Tue, 4 Oct 2016 10:16:50 +0000 (12:16 +0200)
Spawning network connector via config subsystem now
only creates Netconf node from provided values
and writes it to the topology. Topology handles
the rest of mountpoint creation.

Change-Id: I443ca5c6668bf56d8e79cfe83aaa9d76af3b9d50
Signed-off-by: Andrej Mak <andrej.mak@pantheon.tech>
features/netconf-connector/src/main/features/features.xml
netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java
netconf/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModuleFactory.java

index 6253a326bb440771e60c33680a8ac07b52944e00..fe3e66dba3ced96accabdbc0f98c5b10115d1d8a 100644 (file)
@@ -45,8 +45,7 @@
     </feature>
 
     <feature name='odl-netconf-connector-ssh' version='${project.version}' description="OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server + loopback connection configuration">
-        <feature version='${project.version}'>odl-netconf-ssh</feature>
-        <feature version='${project.version}'>odl-netconf-connector</feature>
+        <feature version='${project.version}'>odl-netconf-topology</feature>
         <configfile finalname="${config.configfile.directory}/${config.netconf.connector.configfile}">mvn:org.opendaylight.netconf/netconf-connector-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
index 6ca1436e952cc1b63f55c7c0b60bc8b98e169857..34f86655964933f13f7db2d1b6235cf93802753e 100644 (file)
  */
 package org.opendaylight.controller.config.yang.md.sal.connector.netconf;
 
-import static com.google.common.base.Preconditions.checkArgument;
 import static org.opendaylight.controller.config.api.JmxAttributeValidationException.checkCondition;
 import static org.opendaylight.controller.config.api.JmxAttributeValidationException.checkNotNull;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
-import io.netty.util.concurrent.EventExecutor;
-import java.io.File;
-import java.math.BigDecimal;
-import java.net.InetSocketAddress;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
-import org.opendaylight.controller.config.api.JmxAttributeValidationException;
-import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
-import org.opendaylight.controller.config.threadpool.ThreadPool;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import javax.annotation.Nullable;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.core.api.Broker;
-import org.opendaylight.netconf.client.NetconfClientDispatcher;
-import org.opendaylight.netconf.client.conf.NetconfClientConfiguration;
-import org.opendaylight.netconf.client.conf.NetconfReconnectingClientConfiguration;
-import org.opendaylight.netconf.client.conf.NetconfReconnectingClientConfigurationBuilder;
-import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.LoginPassword;
-import org.opendaylight.netconf.sal.connect.api.RemoteDeviceHandler;
-import org.opendaylight.netconf.sal.connect.netconf.LibraryModulesSchemas;
-import org.opendaylight.netconf.sal.connect.netconf.NetconfDevice;
-import org.opendaylight.netconf.sal.connect.netconf.NetconfDeviceBuilder;
-import org.opendaylight.netconf.sal.connect.netconf.NetconfStateSchemasResolverImpl;
-import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfDeviceCommunicator;
-import org.opendaylight.netconf.sal.connect.netconf.listener.NetconfSessionPreferences;
-import org.opendaylight.netconf.sal.connect.netconf.listener.UserPreferences;
-import org.opendaylight.netconf.sal.connect.netconf.sal.KeepaliveSalFacade;
-import org.opendaylight.netconf.sal.connect.netconf.sal.NetconfDeviceSalFacade;
-import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
-import org.opendaylight.netconf.sal.connect.netconf.schema.YangLibrarySchemaYangSourceProvider;
-import org.opendaylight.protocol.framework.ReconnectStrategy;
-import org.opendaylight.protocol.framework.ReconnectStrategyFactory;
-import org.opendaylight.protocol.framework.TimedReconnectStrategy;
+import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.model.repo.api.RevisionSourceIdentifier;
-import org.opendaylight.yangtools.yang.model.repo.api.SchemaContextFactory;
-import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository;
-import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceFilter;
-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.SchemaSourceRegistration;
-import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry;
-import org.opendaylight.yangtools.yang.model.repo.util.FilesystemSchemaSourceCache;
-import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository;
-import org.opendaylight.yangtools.yang.parser.util.TextToASTTransformer;
-import org.osgi.framework.BundleContext;
+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.netconf.node.credentials.Credentials;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.netconf.node.credentials.credentials.LoginPasswordBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
+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.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
+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.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  *
  */
-public final class NetconfConnectorModule extends org.opendaylight.controller.config.yang.md.sal.connector.netconf.AbstractNetconfConnectorModule
-{
+public final class NetconfConnectorModule extends org.opendaylight.controller.config.yang.md.sal.connector.netconf.AbstractNetconfConnectorModule implements BindingAwareConsumer {
     private static final Logger LOG = LoggerFactory.getLogger(NetconfConnectorModule.class);
 
-    /**
-     * Filesystem based caches are stored relative to the cache directory.
-     */
-    private static final String CACHE_DIRECTORY = "cache";
-
-    /**
-     * The default cache directory relative to <code>CACHE_DIRECTORY</code>
-     */
-    private static final String DEFAULT_CACHE_DIRECTORY = "schema";
-
-    /**
-     * The qualified schema cache directory <code>cache/schema</code>
-     */
-    private static final String QUALIFIED_DEFAULT_CACHE_DIRECTORY = CACHE_DIRECTORY + File.separator+ DEFAULT_CACHE_DIRECTORY;
-
-    /**
-     * The name for the default schema repository
-     */
-    private static final String DEFAULT_SCHEMA_REPOSITORY_NAME = "sal-netconf-connector";
-
-    /**
-     * The default schema repository in the case that one is not specified.
-     */
-    private static final SharedSchemaRepository DEFAULT_SCHEMA_REPOSITORY =
-            new SharedSchemaRepository(DEFAULT_SCHEMA_REPOSITORY_NAME);
-
-    /**
-     * The default <code>FilesystemSchemaSourceCache</code>, which stores cached files in <code>cache/schema</code>.
-     */
-    private static final FilesystemSchemaSourceCache<YangTextSchemaSource> DEFAULT_CACHE =
-            new FilesystemSchemaSourceCache<>(DEFAULT_SCHEMA_REPOSITORY, YangTextSchemaSource.class,
-                    new File(QUALIFIED_DEFAULT_CACHE_DIRECTORY));
-
-    /**
-     * The default factory for creating <code>SchemaContext</code> instances.
-     */
-    private static final SchemaContextFactory DEFAULT_SCHEMA_CONTEXT_FACTORY =
-            DEFAULT_SCHEMA_REPOSITORY.createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT);
-
-    private static final int LOCAL_IO_FALLBACK_COST = PotentialSchemaSource.Costs.LOCAL_IO.getValue() + 1;
-
-    /**
-     * Keeps track of initialized Schema resources.  A Map is maintained in which the key represents the name
-     * of the schema cache directory, and the value is a corresponding <code>SchemaResourcesDTO</code>.  The
-     * <code>SchemaResourcesDTO</code> is essentially a container that allows for the extraction of the
-     * <code>SchemaRegistry</code> and <code>SchemaContextFactory</code> which should be used for a particular
-     * Netconf mount.  Access to <code>schemaResourcesDTOs</code> should be surrounded by appropriate
-     * synchronization locks.
-     */
-    private static volatile Map<String, NetconfDevice.SchemaResourcesDTO> schemaResourcesDTOs = new HashMap<>();
-
-    // Initializes default constant instances for the case when the default schema repository
-    // directory cache/schema is used.
-    static {
-        schemaResourcesDTOs.put(DEFAULT_CACHE_DIRECTORY,
-                new NetconfDevice.SchemaResourcesDTO(DEFAULT_SCHEMA_REPOSITORY, DEFAULT_SCHEMA_REPOSITORY,
-                        DEFAULT_SCHEMA_CONTEXT_FACTORY,
-                        new NetconfStateSchemasResolverImpl()));
-        DEFAULT_SCHEMA_REPOSITORY.registerSchemaSourceListener(DEFAULT_CACHE);
-        DEFAULT_SCHEMA_REPOSITORY.registerSchemaSourceListener(
-                TextToASTTransformer.create(DEFAULT_SCHEMA_REPOSITORY, DEFAULT_SCHEMA_REPOSITORY));
-    }
-
-    private BundleContext bundleContext;
-    private Optional<NetconfSessionPreferences> userCapabilities;
-    private SchemaSourceRegistry schemaRegistry = DEFAULT_SCHEMA_REPOSITORY;
-    private SchemaRepository schemaRepository = DEFAULT_SCHEMA_REPOSITORY;
-    private SchemaContextFactory schemaContextFactory = DEFAULT_SCHEMA_CONTEXT_FACTORY;
-
-    private Broker domRegistry;
-    private NetconfClientDispatcher clientDispatcher;
-    private BindingAwareBroker bindingRegistry;
-    private ThreadPool processingExecutor;
-    private ScheduledThreadPool keepaliveExecutor;
-    private EventExecutor eventExecutor;
-
-    /**
-     * The name associated with the Netconf mount point.  This value is passed from <code>NetconfConnectorModuleFactory</code>.
-     */
-    private String instanceName;
+    private static final InstanceIdentifier<Topology> TOPOLOGY_PATH = InstanceIdentifier.create(NetworkTopology.class)
+            .child(Topology.class, new TopologyKey(new TopologyId("topology-netconf")));
+    private final String instanceName;
+    private InstanceIdentifier<Node> nodePath;
+    private DataBroker dataBroker;
 
     public NetconfConnectorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
+        instanceName = identifier.getInstanceName();
     }
 
     public NetconfConnectorModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, final NetconfConnectorModule oldModule, final java.lang.AutoCloseable oldInstance) {
         super(identifier, dependencyResolver, oldModule, oldInstance);
+        instanceName = identifier.getInstanceName();
     }
 
     @Override
@@ -182,12 +75,10 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
         checkCondition(getBetweenAttemptsTimeoutMillis() > 0, "must be > 0", betweenAttemptsTimeoutMillisJmxAttribute);
 
         // Check username + password in case of ssh
-        if(getTcpOnly() == false) {
+        if (!getTcpOnly()) {
             checkNotNull(getUsername(), usernameJmxAttribute);
             checkNotNull(getPassword(), passwordJmxAttribute);
         }
-
-        userCapabilities = getUserCapabilities();
     }
 
     private boolean isHostAddressPresent(final Host address) {
@@ -195,299 +86,79 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co
                address.getIpAddress() != null && (address.getIpAddress().getIpv4Address() != null || address.getIpAddress().getIpv6Address() != null);
     }
 
-    @Deprecated
-    private static ScheduledExecutorService DEFAULT_KEEPALIVE_EXECUTOR;
-
     @Override
     public java.lang.AutoCloseable createInstance() {
-        initDependencies();
-        final RemoteDeviceId id = new RemoteDeviceId(getIdentifier(), getSocketAddress());
-
-        final ExecutorService globalProcessingExecutor = processingExecutor.getExecutor();
-
-        RemoteDeviceHandler<NetconfSessionPreferences> salFacade
-                = new NetconfDeviceSalFacade(id, domRegistry, bindingRegistry);
-
-        final Long keepaliveDelay = getKeepaliveDelay();
-        if (shouldSendKeepalive()) {
-            // Keepalive executor is optional for now and a default instance is supported
-            final ScheduledExecutorService executor = keepaliveExecutor == null ? DEFAULT_KEEPALIVE_EXECUTOR : keepaliveExecutor.getExecutor();
-
-            salFacade = new KeepaliveSalFacade(id, salFacade, executor, keepaliveDelay, getDefaultRequestTimeoutMillis());
-        }
-
-        // Setup information related to the SchemaRegistry, SchemaResourceFactory, etc.
-        NetconfDevice.SchemaResourcesDTO schemaResourcesDTO = null;
-        final String moduleSchemaCacheDirectory = getSchemaCacheDirectory();
-        // Only checks to ensure the String is not empty or null;  further checks related to directory accessibility and file permissions
-        // are handled during the FilesystemSchemaSourceCache initialization.
-        if (!Strings.isNullOrEmpty(moduleSchemaCacheDirectory)) {
-            // If a custom schema cache directory is specified, create the backing DTO; otherwise, the SchemaRegistry and
-            // SchemaContextFactory remain the default values.
-            if (!moduleSchemaCacheDirectory.equals(DEFAULT_CACHE_DIRECTORY)) {
-                // Multiple modules may be created at once;  synchronize to avoid issues with data consistency among threads.
-                synchronized(schemaResourcesDTOs) {
-                    // Look for the cached DTO to reuse SchemaRegistry and SchemaContextFactory variables if they already exist
-                    final NetconfDevice.SchemaResourcesDTO dto =
-                            schemaResourcesDTOs.get(moduleSchemaCacheDirectory);
-                    if (dto == null) {
-                        schemaResourcesDTO = createSchemaResourcesDTO(moduleSchemaCacheDirectory);
-                        schemaRegistry.registerSchemaSourceListener(
-                                TextToASTTransformer.create((SchemaRepository) schemaRegistry, schemaRegistry));
-                        schemaResourcesDTOs.put(moduleSchemaCacheDirectory, schemaResourcesDTO);
-                    } else {
-                        setSchemaContextFactory(dto.getSchemaContextFactory());
-                        setSchemaRegistry(dto.getSchemaRegistry());
-                        schemaResourcesDTO = dto;
-                    }
-                    if (userCapabilities.isPresent()) {
-                        for (QName qname : userCapabilities.get().getModuleBasedCaps()) {
-                            final SourceIdentifier sourceIdentifier = RevisionSourceIdentifier
-                                    .create(qname.getLocalName(), qname.getFormattedRevision());
-                            dto.getSchemaRegistry().registerSchemaSource(DEFAULT_CACHE, PotentialSchemaSource
-                                    .create(sourceIdentifier, YangTextSchemaSource.class, LOCAL_IO_FALLBACK_COST));
-                        }
-                    }
-                }
-                LOG.info("Netconf connector for device {} will use schema cache directory {} instead of {}",
-                        instanceName, moduleSchemaCacheDirectory, DEFAULT_CACHE_DIRECTORY);
-            }
-        } else {
-            LOG.warn("schema-cache-directory for {} is null or empty;  using the default {}",
-                    instanceName, QUALIFIED_DEFAULT_CACHE_DIRECTORY);
-        }
-
-        // pre register yang library sources as fallback schemas to schema registry
-        List<SchemaSourceRegistration<YangTextSchemaSource>> registeredYangLibSources = Lists.newArrayList();
-        if (getYangLibrary() != null) {
-            final String yangLibURL = getYangLibrary().getYangLibraryUrl().getValue();
-            final String yangLibUsername = getYangLibrary().getUsername();
-            final String yangLigPassword = getYangLibrary().getPassword();
-
-            LibraryModulesSchemas libraryModulesSchemas;
-            if(yangLibURL != null) {
-                if(yangLibUsername != null && yangLigPassword != null) {
-                    libraryModulesSchemas = LibraryModulesSchemas.create(yangLibURL, yangLibUsername, yangLigPassword);
-                } else {
-                    libraryModulesSchemas = LibraryModulesSchemas.create(yangLibURL);
-                }
-
-                for (Map.Entry<SourceIdentifier, URL> sourceIdentifierURLEntry : libraryModulesSchemas.getAvailableModels().entrySet()) {
-                    registeredYangLibSources.
-                            add(schemaRegistry.registerSchemaSource(
-                                    new YangLibrarySchemaYangSourceProvider(id, libraryModulesSchemas.getAvailableModels()),
-                                    PotentialSchemaSource
-                                            .create(sourceIdentifierURLEntry.getKey(), YangTextSchemaSource.class,
-                                                    PotentialSchemaSource.Costs.REMOTE_IO.getValue())));
-                }
-            }
-        }
-
-        if (schemaResourcesDTO == null) {
-            schemaResourcesDTO = new NetconfDevice.SchemaResourcesDTO(schemaRegistry, schemaRepository, schemaContextFactory,
-                    new NetconfStateSchemasResolverImpl());
-        }
-
-        final NetconfDevice device = new NetconfDeviceBuilder()
-                .setReconnectOnSchemasChange(getReconnectOnChangedSchema())
-                .setSchemaResourcesDTO(schemaResourcesDTO)
-                .setGlobalProcessingExecutor(globalProcessingExecutor)
-                .setId(id)
-                .setSalFacade(salFacade)
-                .build();
-
-        if (getConcurrentRpcLimit() < 1) {
-            LOG.info("Concurrent rpc limit is smaller than 1, no limit will be enforced for device {}", id);
-        }
-
-        final NetconfDeviceCommunicator listener = userCapabilities.isPresent() ?
-                new NetconfDeviceCommunicator(id, device,
-                        new UserPreferences(userCapabilities.get(), getYangModuleCapabilities().getOverride()), getConcurrentRpcLimit()):
-                new NetconfDeviceCommunicator(id, device, getConcurrentRpcLimit());
-
-        if (shouldSendKeepalive()) {
-            ((KeepaliveSalFacade) salFacade).setListener(listener);
-        }
-
-        final NetconfReconnectingClientConfiguration clientConfig = getClientConfig(listener);
-        listener.initializeRemoteConnection(clientDispatcher, clientConfig);
-
-        return new SalConnectorCloseable(listener, salFacade, registeredYangLibSources);
-    }
-
-    /**
-     * Creates the backing Schema classes for a particular directory.
-     *
-     * @param moduleSchemaCacheDirectory The string directory relative to "cache"
-     * @return A DTO containing the Schema classes for the Netconf mount.
-     */
-    private NetconfDevice.SchemaResourcesDTO createSchemaResourcesDTO(final String moduleSchemaCacheDirectory) {
-        final SharedSchemaRepository repository = new SharedSchemaRepository(instanceName);
-        final SchemaContextFactory schemaContextFactory
-                = repository.createSchemaContextFactory(SchemaSourceFilter.ALWAYS_ACCEPT);
-        setSchemaRegistry(repository);
-        setSchemaContextFactory(schemaContextFactory);
-        final FilesystemSchemaSourceCache<YangTextSchemaSource> deviceCache =
-                createDeviceFilesystemCache(moduleSchemaCacheDirectory);
-        repository.registerSchemaSourceListener(deviceCache);
-        return new NetconfDevice.SchemaResourcesDTO(repository, repository, schemaContextFactory,
-                new NetconfStateSchemasResolverImpl());
-    }
-
-    /**
-     * Creates a <code>FilesystemSchemaSourceCache</code> for the custom schema cache directory.
-     *
-     * @param schemaCacheDirectory The custom cache directory relative to "cache"
-     * @return A <code>FilesystemSchemaSourceCache</code> for the custom schema cache directory
-     */
-    private FilesystemSchemaSourceCache<YangTextSchemaSource> createDeviceFilesystemCache(final String schemaCacheDirectory) {
-        final String relativeSchemaCacheDirectory = CACHE_DIRECTORY + File.separator + schemaCacheDirectory;
-        return new FilesystemSchemaSourceCache<>(schemaRegistry, YangTextSchemaSource.class, new File(relativeSchemaCacheDirectory));
-    }
-
-    private void initDependencies() {
-        domRegistry = getDomRegistryDependency();
-        clientDispatcher = getClientDispatcherDependency();
-        bindingRegistry = getBindingRegistryDependency();
-        processingExecutor = getProcessingExecutorDependency();
-        eventExecutor = getEventExecutorDependency();
-
-        if(getKeepaliveExecutor() == null) {
-            LOG.warn("Keepalive executor missing. Using default instance for now, the configuration needs to be updated");
-
-            // Instantiate the default executor, now we know its necessary
-            if(DEFAULT_KEEPALIVE_EXECUTOR == null) {
-                DEFAULT_KEEPALIVE_EXECUTOR = Executors.newScheduledThreadPool(2, new ThreadFactory() {
-                    @Override
-                    public Thread newThread(final Runnable r) {
-                        final Thread thread = new Thread(r);
-                        thread.setName("netconf-southound-keepalives-" + thread.getId());
-                        thread.setDaemon(true);
-                        return thread;
-                    }
-                });
-            }
-        } else {
-            keepaliveExecutor = getKeepaliveExecutorDependency();
-        }
-    }
-
-    private boolean shouldSendKeepalive() {
-        return getKeepaliveDelay() > 0;
-    }
-
-    private Optional<NetconfSessionPreferences> getUserCapabilities() {
-        if(getYangModuleCapabilities() == null) {
-            return Optional.absent();
-        }
-
-        final List<String> capabilities = getYangModuleCapabilities().getCapability();
-        if(capabilities == null || capabilities.isEmpty()) {
-            return Optional.absent();
-        }
-
-        final NetconfSessionPreferences parsedOverrideCapabilities = NetconfSessionPreferences.fromStrings(capabilities);
-        JmxAttributeValidationException.checkCondition(
-                parsedOverrideCapabilities.getNonModuleCaps().isEmpty(),
-                "Capabilities to override can only contain module based capabilities, non-module capabilities will be retrieved from the device," +
-                        " configured non-module capabilities: " + parsedOverrideCapabilities.getNonModuleCaps(),
-                yangModuleCapabilitiesJmxAttribute);
-
-        return Optional.of(parsedOverrideCapabilities);
-    }
-
-    public NetconfReconnectingClientConfiguration getClientConfig(final NetconfDeviceCommunicator listener) {
-        final InetSocketAddress socketAddress = getSocketAddress();
-        final long clientConnectionTimeoutMillis = getConnectionTimeoutMillis();
-
-        final ReconnectStrategyFactory sf = new TimedReconnectStrategyFactory(eventExecutor,
-                getMaxConnectionAttempts(), getBetweenAttemptsTimeoutMillis(), getSleepFactor());
-        final ReconnectStrategy strategy = sf.createReconnectStrategy();
-
-        return NetconfReconnectingClientConfigurationBuilder.create()
-        .withAddress(socketAddress)
-        .withConnectionTimeoutMillis(clientConnectionTimeoutMillis)
-        .withReconnectStrategy(strategy)
-        .withAuthHandler(new LoginPassword(getUsername(), getPassword()))
-        .withProtocol(getTcpOnly() ?
-                NetconfClientConfiguration.NetconfClientProtocol.TCP :
-                NetconfClientConfiguration.NetconfClientProtocol.SSH)
-        .withConnectStrategyFactory(sf)
-        .withSessionListener(listener)
-        .build();
+        getBindingRegistryDependency().registerConsumer(this);
+        return this::deleteNode;
     }
 
-    private static final class SalConnectorCloseable implements AutoCloseable {
-        private final RemoteDeviceHandler<NetconfSessionPreferences> salFacade;
-        private final List<SchemaSourceRegistration<YangTextSchemaSource>> registeredYangLibSources;
-        private final NetconfDeviceCommunicator listener;
-
-        public SalConnectorCloseable(final NetconfDeviceCommunicator listener,
-                                     final RemoteDeviceHandler<NetconfSessionPreferences> salFacade,
-                                     final List<SchemaSourceRegistration<YangTextSchemaSource>> registeredYangLibSources) {
-            this.listener = listener;
-            this.salFacade = salFacade;
-            this.registeredYangLibSources = registeredYangLibSources;
-        }
-
-        @Override
-        public void close() {
-            for (SchemaSourceRegistration<YangTextSchemaSource> registeredYangLibSource : registeredYangLibSources) {
-                registeredYangLibSource.close();
+    @Override
+    public void onSessionInitialized(final BindingAwareBroker.ConsumerContext session) {
+        dataBroker = session.getSALService(DataBroker.class);
+        final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
+        final NodeId nodeId = new NodeId(instanceName);
+        final NodeKey nodeKey = new NodeKey(nodeId);
+        final Node node = createrNetconfNode(nodeId, nodeKey);
+        nodePath = TOPOLOGY_PATH.child(Node.class, nodeKey);
+        transaction.put(LogicalDatastoreType.CONFIGURATION, nodePath, node);
+        final CheckedFuture<Void, TransactionCommitFailedException> submitFuture = transaction.submit();
+        Futures.addCallback(submitFuture, new FutureCallback<Void>() {
+            @Override
+            public void onSuccess(@Nullable final Void result) {
+                LOG.debug("Node {} was successfully added to the topology", instanceName);
             }
-            listener.close();
-            salFacade.close();
-        }
-    }
 
-    private static final class TimedReconnectStrategyFactory implements ReconnectStrategyFactory {
-        private final Long connectionAttempts;
-        private final EventExecutor executor;
-        private final double sleepFactor;
-        private final int minSleep;
-
-        TimedReconnectStrategyFactory(final EventExecutor executor, final Long maxConnectionAttempts, final int minSleep, final BigDecimal sleepFactor) {
-            if (maxConnectionAttempts != null && maxConnectionAttempts > 0) {
-                connectionAttempts = maxConnectionAttempts;
-            } else {
-                LOG.trace("Setting {} on {} to infinity", maxConnectionAttemptsJmxAttribute, this);
-                connectionAttempts = null;
+            @Override
+            public void onFailure(final Throwable t) {
+                LOG.error("Node {} creation failed: {}", instanceName, t);
             }
+        });
+    }
+
+    private void deleteNode() {
+        if (dataBroker != null) {
+            final WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
+            transaction.delete(LogicalDatastoreType.CONFIGURATION, nodePath);
+            final CheckedFuture<Void, TransactionCommitFailedException> submitFuture = transaction.submit();
+            Futures.addCallback(submitFuture, new FutureCallback<Void>() {
+                @Override
+                public void onSuccess(@Nullable final Void result) {
+                    LOG.debug("Node {} was successfully deleted from the topology", instanceName);
+                }
 
-            this.sleepFactor = sleepFactor.doubleValue();
-            this.executor = executor;
-            this.minSleep = minSleep;
-        }
-
-        @Override
-        public ReconnectStrategy createReconnectStrategy() {
-            final Long maxSleep = null;
-            final Long deadline = null;
-
-            return new TimedReconnectStrategy(executor, minSleep,
-                    minSleep, sleepFactor, maxSleep, connectionAttempts, deadline);
-        }
-    }
+                @Override
+                public void onFailure(final Throwable t) {
+                    LOG.error("Node {} deletion failed: {}", instanceName, t);
+                }
+            });
 
-    private InetSocketAddress getSocketAddress() {
-        if(getAddress().getDomainName() != null) {
-            return new InetSocketAddress(getAddress().getDomainName().getValue(), getPort().getValue());
-        } else {
-            final IpAddress ipAddress = getAddress().getIpAddress();
-            final String ip = ipAddress.getIpv4Address() != null ? ipAddress.getIpv4Address().getValue() : ipAddress.getIpv6Address().getValue();
-            return new InetSocketAddress(ip, getPort().getValue());
         }
     }
 
-    public void setSchemaRegistry(final SchemaSourceRegistry schemaRegistry) {
-        this.schemaRegistry = schemaRegistry;
-    }
-
-    public void setSchemaContextFactory(final SchemaContextFactory schemaContextFactory) {
-        this.schemaContextFactory = schemaContextFactory;
-    }
-
-    public void setInstanceName(final String instanceName) {
-        this.instanceName = instanceName;
+    private Node createrNetconfNode(final NodeId nodeId, final NodeKey nodeKey) {
+        final Credentials credentials = new LoginPasswordBuilder()
+                .setUsername(getUsername())
+                .setPassword(getPassword())
+                .build();
+        final NetconfNode netconfNode = new NetconfNodeBuilder()
+                .setHost(getAddress())
+                .setPort(getPort())
+                .setCredentials(credentials)
+                .setConnectionTimeoutMillis(getConnectionTimeoutMillis())
+                .setDefaultRequestTimeoutMillis(getDefaultRequestTimeoutMillis())
+                .setBetweenAttemptsTimeoutMillis(getBetweenAttemptsTimeoutMillis())
+                .setConcurrentRpcLimit(getConcurrentRpcLimit())
+                .setKeepaliveDelay(getKeepaliveDelay())
+                .setMaxConnectionAttempts(getMaxConnectionAttempts())
+                .setReconnectOnChangedSchema(getReconnectOnChangedSchema())
+                .setSchemaCacheDirectory(getSchemaCacheDirectory())
+                .setSleepFactor(getSleepFactor())
+                .setTcpOnly(getTcpOnly())
+                .build();
+        return new NodeBuilder()
+                .setNodeId(nodeId)
+                .setKey(nodeKey)
+                .addAugmentation(NetconfNode.class, netconfNode)
+                .build();
     }
 }
index 4132e1cd89a74078e9f31a95f4699ab694a79f55..2b31fe05d0e8bba5aea24b984ea62ae287de4b62 100644 (file)
@@ -23,7 +23,6 @@ public class NetconfConnectorModuleFactory extends
             final DynamicMBeanWithInstance old, final BundleContext bundleContext) throws Exception {
         final NetconfConnectorModule module = (NetconfConnectorModule) super.createModule(instanceName, dependencyResolver,
                 old, bundleContext);
-        module.setInstanceName(instanceName);
         return module;
     }
 
@@ -31,7 +30,6 @@ public class NetconfConnectorModuleFactory extends
     public Module createModule(final String instanceName, final DependencyResolver dependencyResolver, final BundleContext bundleContext) {
         final NetconfConnectorModule module = (NetconfConnectorModule) super.createModule(instanceName, dependencyResolver,
                 bundleContext);
-        module.setInstanceName(instanceName);
         return module;
     }
 }