X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fmd%2Fsal%2Fconnector%2Fnetconf%2FNetconfConnectorModule.java;h=ddaf6ea6c378ae7728a00cff8297c82650b3a8d9;hb=620d8fcdaca212c7e8ad674bd3eccf7559319831;hp=f5d592c00715772a87483d09e0ab96d0c4f99697;hpb=56af902306c727ef1db5185c101b878b5cb386a7;p=controller.git diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java index f5d592c007..ddaf6ea6c3 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/config/yang/md/sal/connector/netconf/NetconfConnectorModule.java @@ -1,14 +1,14 @@ -/** -* Generated file - -* Generated from: yang module name: opendaylight-sal-netconf-connector yang module local name: sal-netconf-connector -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon Nov 18 09:44:16 CET 2013 -* -* Do not modify this file unless it is present under src/main directory -*/ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ package org.opendaylight.controller.config.yang.md.sal.connector.netconf; +import static org.opendaylight.controller.config.api.JmxAttributeValidationException.checkCondition; +import static org.opendaylight.controller.config.api.JmxAttributeValidationException.checkNotNull; import io.netty.channel.EventLoopGroup; import io.netty.util.concurrent.GlobalEventExecutor; @@ -19,8 +19,6 @@ import java.net.InetSocketAddress; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.net.ssl.SSLContext; - import org.opendaylight.controller.netconf.client.NetconfClientDispatcher; import org.opendaylight.controller.netconf.client.NetconfSshClientDispatcher; import org.opendaylight.controller.netconf.util.handler.ssh.authentication.AuthenticationHandler; @@ -33,17 +31,17 @@ import org.opendaylight.yangtools.yang.model.util.repo.FilesystemSchemaCachingPr import org.opendaylight.yangtools.yang.model.util.repo.SchemaSourceProvider; import org.opendaylight.yangtools.yang.model.util.repo.SchemaSourceProviders; import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import static com.google.common.base.Preconditions.*; - -import com.google.common.base.Optional; import com.google.common.net.InetAddresses; /** -* -*/ + * + */ public final class NetconfConnectorModule extends org.opendaylight.controller.config.yang.md.sal.connector.netconf.AbstractNetconfConnectorModule { + private static final Logger logger = LoggerFactory.getLogger(NetconfConnectorModule.class); private static ExecutorService GLOBAL_PROCESSING_EXECUTOR = null; private static AbstractCachingSchemaSourceProvider GLOBAL_NETCONF_SOURCE_PROVIDER = null; @@ -58,25 +56,36 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co } @Override - public void validate(){ - super.validate(); - checkState(getAddress() != null,"Address must be set."); + protected void customValidation() { + checkNotNull(getAddress(), addressJmxAttribute); //checkState(getAddress().getIpv4Address() != null || getAddress().getIpv6Address() != null,"Address must be set."); - checkState(getPort() != null,"Port must be set."); - checkState(getDomRegistry() != null,"Dom Registry must be provided."); - } + checkNotNull(getPort(), portJmxAttribute); + checkNotNull(getDomRegistry(), portJmxAttribute); + checkNotNull(getDomRegistry(), domRegistryJmxAttribute); + + checkNotNull(getConnectionTimeoutMillis(), connectionTimeoutMillisJmxAttribute); + checkCondition(getConnectionTimeoutMillis() > 0, "must be > 0", connectionTimeoutMillisJmxAttribute); + checkNotNull(getBetweenAttemptsTimeoutMillis(), betweenAttemptsTimeoutMillisJmxAttribute); + checkCondition(getBetweenAttemptsTimeoutMillis() > 0, "must be > 0", betweenAttemptsTimeoutMillisJmxAttribute); + + } @Override public java.lang.AutoCloseable createInstance() { - + getDomRegistryDependency(); NetconfDevice device = new NetconfDevice(getIdentifier().getInstanceName()); String addressValue = getAddress(); - - - int attemptMsTimeout = 60*1000; - int connectionAttempts = 5; + + Long connectionAttempts; + if (getMaxConnectionAttempts() != null && getMaxConnectionAttempts() > 0) { + connectionAttempts = getMaxConnectionAttempts(); + } else { + logger.trace("Setting {} on {} to infinity", maxConnectionAttemptsJmxAttribute, this); + connectionAttempts = null; + } + long clientConnectionTimeoutMillis = getConnectionTimeoutMillis(); /* * Uncomment after Switch to IP Address if(getAddress().getIpv4Address() != null) { @@ -84,23 +93,27 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co } else { addressValue = getAddress().getIpv6Address().getValue(); } - */ - ReconnectStrategy strategy = new TimedReconnectStrategy(GlobalEventExecutor.INSTANCE, attemptMsTimeout, 1000, 1.0, null, - Long.valueOf(connectionAttempts), null); - + */ + double sleepFactor = 1.0; + int minSleep = 1000; + Long maxSleep = null; + Long deadline = null; + ReconnectStrategy strategy = new TimedReconnectStrategy(GlobalEventExecutor.INSTANCE, getBetweenAttemptsTimeoutMillis(), + minSleep, sleepFactor, maxSleep, connectionAttempts, deadline); + device.setReconnectStrategy(strategy); - + InetAddress addr = InetAddresses.forString(addressValue); InetSocketAddress socketAddress = new InetSocketAddress(addr , getPort().intValue()); - + device.setProcessingExecutor(getGlobalProcessingExecutor()); - + device.setSocketAddress(socketAddress); device.setEventExecutor(getEventExecutorDependency()); - device.setDispatcher(createDispatcher()); + device.setDispatcher(createDispatcher(clientConnectionTimeoutMillis)); device.setSchemaSourceProvider(getGlobalNetconfSchemaProvider(bundleContext)); - + getDomRegistryDependency().registerProvider(device, bundleContext); device.start(); return device; @@ -108,9 +121,9 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co private ExecutorService getGlobalProcessingExecutor() { if(GLOBAL_PROCESSING_EXECUTOR == null) { - + GLOBAL_PROCESSING_EXECUTOR = Executors.newCachedThreadPool(); - + } return GLOBAL_PROCESSING_EXECUTOR; } @@ -118,21 +131,22 @@ public final class NetconfConnectorModule extends org.opendaylight.controller.co private synchronized AbstractCachingSchemaSourceProvider getGlobalNetconfSchemaProvider(BundleContext bundleContext) { if(GLOBAL_NETCONF_SOURCE_PROVIDER == null) { String storageFile = "cache/schema"; - File directory = bundleContext.getDataFile(storageFile); + // File directory = bundleContext.getDataFile(storageFile); + File directory = new File(storageFile); SchemaSourceProvider defaultProvider = SchemaSourceProviders.noopProvider(); GLOBAL_NETCONF_SOURCE_PROVIDER = FilesystemSchemaCachingProvider.createFromStringSourceProvider(defaultProvider, directory); } return GLOBAL_NETCONF_SOURCE_PROVIDER; } - private NetconfClientDispatcher createDispatcher() { + private NetconfClientDispatcher createDispatcher(long clientConnectionTimeoutMillis) { EventLoopGroup bossGroup = getBossThreadGroupDependency(); EventLoopGroup workerGroup = getWorkerThreadGroupDependency(); if(getTcpOnly()) { - return new NetconfClientDispatcher( bossGroup, workerGroup); + return new NetconfClientDispatcher( bossGroup, workerGroup, clientConnectionTimeoutMillis); } else { AuthenticationHandler authHandler = new LoginPassword(getUsername(),getPassword()); - return new NetconfSshClientDispatcher(authHandler , bossGroup, workerGroup); + return new NetconfSshClientDispatcher(authHandler , bossGroup, workerGroup, clientConnectionTimeoutMillis); } }