commit 5233decc2a5c482f7e91abc6911301bec8116932
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed May 02 15:22:37 2018 -0700
committer Ray Milkey <ray@opennetworking.org> Thu May 03 16:01:08 2018 +0000
tree ac5c0021cfe63db0dbc2698cb6d585cc86235111
parent 8dee14559fcbbc09ac8e675505fc30889bebadeb

Remove deprecated NetconfSessionImpl

Change-Id: I92d9407ff4bc0c25ca7b998cc4f387c3f40f9ace

protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java

diff --git a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
index 2c885e0..ab0189d 100644
--- a/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
+++ b/protocols/netconf/ctl/src/main/java/org/onosproject/netconf/ctl/impl/NetconfControllerImpl.java
@@ -71,8 +71,6 @@
 @Service
 public class NetconfControllerImpl implements NetconfController {
 
-    private static final String ETHZ_SSH2 = "ethz-ssh2";
-
     protected static final int DEFAULT_CONNECT_TIMEOUT_SECONDS = 5;
     private static final String PROP_NETCONF_CONNECT_TIMEOUT = "netconfConnectTimeout";
     // FIXME @Property should not be static
@@ -97,7 +95,7 @@
     private static final String SSH_LIBRARY = "sshLibrary";
     private static final String APACHE_MINA_STR = "apache-mina";
     @Property(name = SSH_LIBRARY, value = APACHE_MINA_STR,
-            label = "Ssh Library instead of apache_mina (i.e. ethz-ssh2")
+            label = "Ssh client library to use")
     protected NetconfSshClientLib sshLibrary = NetconfSshClientLib.APACHE_MINA;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
@@ -351,13 +349,6 @@
         @Override
         public NetconfDevice createNetconfDevice(NetconfDeviceInfo netconfDeviceInfo)
                 throws NetconfException {
-            if (NetconfSshClientLib.ETHZ_SSH2.equals(netconfDeviceInfo.sshClientLib().orElse(null)) ||
-                    NetconfSshClientLib.ETHZ_SSH2.equals(sshLibrary)) {
-                log.info("Creating NETCONF session to {} with {}",
-                            netconfDeviceInfo.name(), NetconfSshClientLib.ETHZ_SSH2);
-                return new DefaultNetconfDevice(netconfDeviceInfo,
-                            new NetconfSessionImpl.SshNetconfSessionFactory());
-            }
             log.info("Creating NETCONF session to {} with {}",
                     netconfDeviceInfo.getDeviceId(), NetconfSshClientLib.APACHE_MINA);
             return new DefaultNetconfDevice(netconfDeviceInfo);