From b03c5a20673792f0fb8df847fbaf9c359c7cce1b Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 24 Mar 2015 13:33:54 +0100 Subject: [PATCH] Increase default negotiation timeout for netconf server to 30s 5s is a bit too short. especially when testing. Change-Id: I47a1ccedab596c78e9d1ba314679d0b542722889 Signed-off-by: Maros Marsalek --- .../netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java | 2 +- .../controller/netconf/util/osgi/NetconfConfigUtil.java | 3 ++- .../controller/netconf/util/osgi/NetconfConfigUtilTest.java | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java index cda940f9b7..064ae72bc7 100644 --- a/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java +++ b/opendaylight/netconf/netconf-netty-util/src/main/java/org/opendaylight/controller/netconf/nettyutil/handler/ssh/client/AsyncSshHandler.java @@ -180,7 +180,7 @@ public class AsyncSshHandler extends ChannelOutboundHandlerAdapter { @Override public synchronized void connect(final ChannelHandlerContext ctx, final SocketAddress remoteAddress, final SocketAddress localAddress, final ChannelPromise promise) throws Exception { - LOG.debug("XXX session connecting on channel {}. promise: {} ", ctx.channel(), connectPromise); + LOG.debug("SSH session connecting on channel {}. promise: {} ", ctx.channel(), connectPromise); this.connectPromise = promise; startSsh(ctx, remoteAddress); } 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 64aeebd542..6855aa73c3 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 @@ -11,6 +11,7 @@ package org.opendaylight.controller.netconf.util.osgi; import com.google.common.base.Optional; import io.netty.channel.local.LocalAddress; import java.net.InetSocketAddress; +import java.util.concurrent.TimeUnit; import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +33,7 @@ public final class NetconfConfigUtil { private static final String PRIVATE_KEY_PATH_PROP = ".pk.path"; private static final String CONNECTION_TIMEOUT_MILLIS_PROP = "connectionTimeoutMillis"; - private static final long DEFAULT_TIMEOUT_MILLIS = 5000; + public static final long DEFAULT_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(30); private static final LocalAddress netconfLocalAddress = new LocalAddress("netconf"); public static LocalAddress getNetconfLocalAddress() { diff --git a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java index 1a701057aa..a50d7fc61f 100644 --- a/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java +++ b/opendaylight/netconf/netconf-util/src/test/java/org/opendaylight/controller/netconf/util/osgi/NetconfConfigUtilTest.java @@ -35,10 +35,10 @@ public class NetconfConfigUtilTest { assertEquals(NetconfConfigUtil.getNetconfLocalAddress(), new LocalAddress("netconf")); doReturn("").when(bundleContext).getProperty("netconf.connectionTimeoutMillis"); - assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), 5000); + assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), NetconfConfigUtil.DEFAULT_TIMEOUT_MILLIS); doReturn("a").when(bundleContext).getProperty("netconf.connectionTimeoutMillis"); - assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), 5000); + assertEquals(NetconfConfigUtil.extractTimeoutMillis(bundleContext), NetconfConfigUtil.DEFAULT_TIMEOUT_MILLIS); } @Test -- 2.36.6