X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fnetconf-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Futil%2Fosgi%2FNetconfConfigUtil.java;h=333fea3493172286fdba2c807eff105760741411;hb=e3b0eb3bd7f61ab9f54a61d8b8e2d37685262e2c;hp=987708d67ed03db1276a6459ad47c75f7eabf0bf;hpb=25344a336764b540d4cbd7ce28151058af69049b;p=controller.git diff --git a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtil.java b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtil.java index 987708d67e..333fea3493 100644 --- a/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtil.java +++ b/opendaylight/netconf/netconf-util/src/main/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtil.java @@ -8,76 +8,127 @@ package org.opendaylight.controller.netconf.util.osgi; - import com.google.common.base.Optional; - import java.net.InetSocketAddress; - import org.osgi.framework.BundleContext; - import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Optional; +import io.netty.channel.local.LocalAddress; +import java.net.InetSocketAddress; +import org.osgi.framework.BundleContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public final class NetconfConfigUtil { + private static final Logger logger = LoggerFactory.getLogger(NetconfConfigUtil.class); -public class NetconfConfigUtil { private static final String PREFIX_PROP = "netconf."; - private enum InfixProp { + private NetconfConfigUtil() { + } + + public enum InfixProp { tcp, ssh } private static final String PORT_SUFFIX_PROP = ".port"; private static final String ADDRESS_SUFFIX_PROP = ".address"; - private static final String CLIENT_PROP = ".client"; - - public static InetSocketAddress extractTCPNetconfAddress(BundleContext context, String exceptionMessageIfNotFound, boolean forClient) { + private static final String PRIVATE_KEY_PATH_PROP = ".pk.path"; - Optional inetSocketAddressOptional = extractSomeNetconfAddress(context, InfixProp.tcp, exceptionMessageIfNotFound, forClient); + private static final String CONNECTION_TIMEOUT_MILLIS_PROP = "connectionTimeoutMillis"; + private static final long DEFAULT_TIMEOUT_MILLIS = 5000; + private static final LocalAddress netconfLocalAddress = new LocalAddress("netconf"); - if (inetSocketAddressOptional.isPresent() == false) { - throw new IllegalStateException("Netconf tcp address not found." + exceptionMessageIfNotFound); - } - return inetSocketAddressOptional.get(); + public static LocalAddress getNetconfLocalAddress() { + return netconfLocalAddress; } - public static Optional extractSSHNetconfAddress(BundleContext context, String exceptionMessage) { - return extractSomeNetconfAddress(context, InfixProp.ssh, exceptionMessage, false); + public static long extractTimeoutMillis(final BundleContext bundleContext) { + final String key = PREFIX_PROP + CONNECTION_TIMEOUT_MILLIS_PROP; + final String timeoutString = bundleContext.getProperty(key); + if (timeoutString == null || timeoutString.length() == 0) { + return DEFAULT_TIMEOUT_MILLIS; + } + try { + return Long.parseLong(timeoutString); + } catch (final NumberFormatException e) { + logger.warn("Cannot parse {} property: {}, using defaults", key, timeoutString, e); + return DEFAULT_TIMEOUT_MILLIS; + } } /** - * @param context - * from which properties are being read. - * @param infixProp - * either tcp or ssh - * @return value if address and port are valid. - * @throws IllegalStateException - * if address or port are invalid, or configuration is missing + * Get extracted address or default. + * + * @throws java.lang.IllegalStateException if neither address is present. */ - private static Optional extractSomeNetconfAddress(BundleContext context, - InfixProp infixProp, - String exceptionMessage, - boolean client) { - String address = ""; - if (client) { - address = context.getProperty(PREFIX_PROP + infixProp + CLIENT_PROP + ADDRESS_SUFFIX_PROP); - } - if (address == null || address.equals("")){ - address = context.getProperty(PREFIX_PROP + infixProp + ADDRESS_SUFFIX_PROP); - } - if (address == null || address.equals("")) { - throw new IllegalStateException("Cannot find initial netconf configuration for parameter " - +PREFIX_PROP + infixProp + ADDRESS_SUFFIX_PROP - +" in config.ini. "+exceptionMessage); + private static InetSocketAddress getNetconfAddress(final InetSocketAddress defaultAddress, Optional extractedAddress, InfixProp infix) { + InetSocketAddress inetSocketAddress; + + if (extractedAddress.isPresent() == false) { + logger.debug("Netconf {} address not found, falling back to default {}", infix, defaultAddress); + + if (defaultAddress == null) { + logger.warn("Netconf {} address not found, default address not provided", infix); + throw new IllegalStateException("Netconf " + infix + " address not found, default address not provided"); + } + inetSocketAddress = defaultAddress; + } else { + inetSocketAddress = extractedAddress.get(); } - String portKey = ""; - if (client) { - portKey = PREFIX_PROP + infixProp + CLIENT_PROP + PORT_SUFFIX_PROP; + + return inetSocketAddress; + } + + public static String getPrivateKeyPath(final BundleContext context) { + return getPropertyValue(context, getPrivateKeyKey()); + } + + public static String getPrivateKeyKey() { + return PREFIX_PROP + InfixProp.ssh + PRIVATE_KEY_PATH_PROP; + } + + private static String getPropertyValue(final BundleContext context, final String propertyName) { + final String propertyValue = context.getProperty(propertyName); + if (propertyValue == null) { + throw new IllegalStateException("Cannot find initial property with name '" + propertyName + "'"); } - if (portKey == null || portKey.equals("")){ - portKey = PREFIX_PROP + infixProp + PORT_SUFFIX_PROP; + return propertyValue; + } + + public static String getNetconfServerAddressKey(InfixProp infixProp) { + return PREFIX_PROP + infixProp + ADDRESS_SUFFIX_PROP; + } + + /** + * @param context from which properties are being read. + * @param infixProp either tcp or ssh + * @return value if address and port are present and valid, Optional.absent otherwise. + * @throws IllegalStateException if address or port are invalid, or configuration is missing + */ + public static Optional extractNetconfServerAddress(final BundleContext context, + final InfixProp infixProp) { + + final Optional address = getProperty(context, getNetconfServerAddressKey(infixProp)); + final Optional port = getProperty(context, PREFIX_PROP + infixProp + PORT_SUFFIX_PROP); + + if (address.isPresent() && port.isPresent()) { + try { + return Optional.of(parseAddress(address, port)); + } catch (final RuntimeException e) { + logger.warn("Unable to parse {} netconf address from {}:{}, fallback to default", + infixProp, address, port, e); + } } - String portString = context.getProperty(portKey); - checkNotNull(portString, "Netconf port must be specified in properties file with " + portKey); - try { - int port = Integer.valueOf(portString); - return Optional.of(new InetSocketAddress(address, port)); - } catch (RuntimeException e) { - throw new IllegalStateException("Cannot create " + infixProp + " netconf address from address:" + address - + " and port:" + portString, e); + return Optional.absent(); + } + + private static InetSocketAddress parseAddress(final Optional address, final Optional port) { + final int portNumber = Integer.valueOf(port.get()); + return new InetSocketAddress(address.get(), portNumber); + } + + private static Optional getProperty(final BundleContext context, final String propKey) { + String value = context.getProperty(propKey); + if (value != null && value.isEmpty()) { + value = null; } + return Optional.fromNullable(value); } }