Added configurable connection timeout for Netconf Server connection.
Change-Id: I40fd1737529e5e864f16119293e46340243118cb
diff --git a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
index 4fa9644..6bb8082 100644
--- a/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
+++ b/providers/netconf/device/src/test/java/org/onosproject/provider/netconf/device/impl/NetconfDeviceProviderTest.java
@@ -22,6 +22,7 @@
import static org.slf4j.LoggerFactory.getLogger;
import java.io.IOException;
+import java.net.SocketTimeoutException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.Collection;
@@ -34,7 +35,6 @@
import org.easymock.EasyMock;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.onlab.packet.ChassisId;
import org.onosproject.cfg.ComponentConfigService;
@@ -179,15 +179,12 @@
return dictionary;
}
- @Ignore
- @Test(expected = IOException.class)
- public void testSSHAuthentication() throws IOException, JNCException {
- TestDeviceCreator objForTestDev = new TestDeviceCreator(
- new NetconfDevice(
- "10.18.14.19",
- 22,
- "cisco",
- "cisco"),
+ @Test(expected = SocketTimeoutException.class)
+ public void testSSHAuthentication() throws JNCException, IOException {
+ NetconfDevice netconfDevice = new NetconfDevice("10.18.14.19", 22,
+ "cisco", "cisco");
+ netconfDevice.setConnectTimeout(1000);
+ TestDeviceCreator objForTestDev = new TestDeviceCreator(netconfDevice,
true);
objForTestDev.run();
}
@@ -344,7 +341,8 @@
* Initialize Netconf Device object, and notify core saying device
* connected.
*/
- private void advertiseDevices() throws JNCException, IOException {
+ private void advertiseDevices()
+ throws JNCException, IOException, SocketTimeoutException {
try {
if (device == null) {
log.warn("The Request Netconf Device is null, cannot proceed further");
@@ -372,6 +370,8 @@
+ " couldn't persist the device onto the store", e);
} catch (JNCException e) {
throw e;
+ } catch (SocketTimeoutException e) {
+ throw e;
} catch (IOException e) {
throw e;
} catch (Exception e) {