ONOS-3791 NETCONF session factory and exception on device connection
Change-Id: I7c6651a4f76537056a2dc8f94d54818b5b238b9a
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 cdcfbf8..251a74b 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
@@ -46,7 +46,7 @@
public static final Logger log = LoggerFactory
.getLogger(NetconfControllerImpl.class);
- public Map<DeviceId, NetconfDevice> netconfDeviceMap = new ConcurrentHashMap<>();
+ private Map<DeviceId, NetconfDevice> netconfDeviceMap = new ConcurrentHashMap<>();
protected Set<NetconfDeviceListener> netconfDeviceListeners = new CopyOnWriteArraySet<>();
@@ -130,6 +130,4 @@
public Map<DeviceId, NetconfDevice> getDevicesMap() {
return netconfDeviceMap;
}
-
-
}
diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java
index 5a8f499..bbc3320 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/NetconfDeviceImpl.java
@@ -20,6 +20,7 @@
import org.onosproject.netconf.NetconfDeviceInfo;
import org.onosproject.netconf.NetconfException;
import org.onosproject.netconf.NetconfSession;
+import org.onosproject.netconf.NetconfSessionFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,12 +36,15 @@
private NetconfDeviceInfo netconfDeviceInfo;
private boolean deviceState = false;
+ protected NetconfSessionFactory sessionFactory = new SshNetconfSessionFactory();
private NetconfSession netconfSession;
- public NetconfDeviceImpl(NetconfDeviceInfo deviceInfo) throws NetconfException {
+
+ public NetconfDeviceImpl(NetconfDeviceInfo deviceInfo)
+ throws NetconfException {
netconfDeviceInfo = deviceInfo;
try {
- netconfSession = new NetconfSessionImpl(netconfDeviceInfo);
+ netconfSession = sessionFactory.createNetconfSession(deviceInfo);
} catch (IOException e) {
throw new NetconfException("Cannot create connection and session for device " +
deviceInfo, e);
@@ -72,4 +76,13 @@
public NetconfDeviceInfo getDeviceInfo() {
return netconfDeviceInfo;
}
+
+ public class SshNetconfSessionFactory implements NetconfSessionFactory {
+
+ @Override
+ public NetconfSession createNetconfSession(NetconfDeviceInfo netconfDeviceInfo) throws NetconfException {
+ return new NetconfSessionImpl(netconfDeviceInfo);
+ }
+ }
+
}
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 7f544dc..9f72d83 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
@@ -401,6 +401,4 @@
completedReply.complete(event.getMessagePayload());
}
}
-
-
}