Added in a second timeout for netconfConnectTimeout
Change-Id: I17c68730b68f7d0db899753dbcea2a570acba8e3
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java
index 0e34a39..00178bc 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfControllerImpl.java
@@ -60,6 +60,12 @@
@Component(immediate = true)
@Service
public class NetconfControllerImpl implements NetconfController {
+ private static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 5;
+ private static final String PROP_NETCONF_CONNECT_TIMEOUT = "netconfConnectTimeout";
+ @Property(name = PROP_NETCONF_CONNECT_TIMEOUT, intValue = DEFAULT_CONNECT_TIMEOUT_SECONDS,
+ label = "Time (in seconds) to wait for a NETCONF connect.")
+ protected static int netconfConnectTimeout = DEFAULT_CONNECT_TIMEOUT_SECONDS;
+
private static final String PROP_NETCONF_REPLY_TIMEOUT = "netconfReplyTimeout";
private static final int DEFAULT_REPLY_TIMEOUT_SECONDS = 5;
@Property(name = PROP_NETCONF_REPLY_TIMEOUT, intValue = DEFAULT_REPLY_TIMEOUT_SECONDS,
@@ -103,6 +109,7 @@
public void modified(ComponentContext context) {
if (context == null) {
netconfReplyTimeout = DEFAULT_REPLY_TIMEOUT_SECONDS;
+ netconfConnectTimeout = DEFAULT_CONNECT_TIMEOUT_SECONDS;
log.info("No component configuration");
return;
}
@@ -110,17 +117,33 @@
Dictionary<?, ?> properties = context.getProperties();
int newNetconfReplyTimeout;
+ int newNetconfConnectTimeout;
try {
String s = get(properties, PROP_NETCONF_REPLY_TIMEOUT);
newNetconfReplyTimeout = isNullOrEmpty(s) ?
netconfReplyTimeout : Integer.parseInt(s.trim());
+
+ s = get(properties, PROP_NETCONF_CONNECT_TIMEOUT);
+ newNetconfConnectTimeout = isNullOrEmpty(s) ?
+ netconfConnectTimeout : Integer.parseInt(s.trim());
+
} catch (NumberFormatException e) {
log.warn("Component configuration had invalid value", e);
return;
}
+ if (newNetconfConnectTimeout < 0) {
+ log.warn("netconfConnectTimeout is invalid - less than 0");
+ return;
+ } else if (newNetconfReplyTimeout <= 0) {
+ log.warn("netconfReplyTimeout is invalid - 0 or less.");
+ return;
+ }
+
netconfReplyTimeout = newNetconfReplyTimeout;
- log.info("Settings: {} = {}", PROP_NETCONF_REPLY_TIMEOUT, netconfReplyTimeout);
+ netconfConnectTimeout = newNetconfConnectTimeout;
+ log.info("Settings: {} = {}, {} = {}",
+ PROP_NETCONF_REPLY_TIMEOUT, netconfReplyTimeout, PROP_NETCONF_CONNECT_TIMEOUT, netconfConnectTimeout);
}
@Override
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java
index aef6942..b080b4e 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfSessionImpl.java
@@ -50,8 +50,6 @@
private static final Logger log = LoggerFactory
.getLogger(NetconfSessionImpl.class);
-
- private static final int CONNECTION_TIMEOUT = 0;
private static final String ENDPATTERN = "]]>]]>";
private static final String MESSAGE_ID_STRING = "message-id";
private static final String HELLO = "<hello";
@@ -111,8 +109,10 @@
private void startConnection() throws NetconfException {
if (!connectionActive) {
netconfConnection = new Connection(deviceInfo.ip().toString(), deviceInfo.port());
+ int connectTimeout = NetconfControllerImpl.netconfConnectTimeout;
+
try {
- netconfConnection.connect(null, CONNECTION_TIMEOUT, 5000);
+ netconfConnection.connect(null, 1000 * connectTimeout, 1000 * connectTimeout);
} catch (IOException e) {
throw new NetconfException("Cannot open a connection with device" + deviceInfo, e);
}