summaryrefslogtreecommitdiffstats
path: root/saltstack-adapter/saltstack-adapter-provider/src
diff options
context:
space:
mode:
authorArindam Mondal <arind.mondal@samsung.com>2019-07-16 13:18:53 +0900
committerArindam Mondal <arind.mondal@samsung.com>2019-07-16 06:10:54 +0000
commit655ab9613d658733fde9c3b1d13f0252b102f9bd (patch)
tree56bc978610f3a252200522664da359838ee78410 /saltstack-adapter/saltstack-adapter-provider/src
parentf63cbc60cea79e8dc338b722d385618e98a8c78b (diff)
Update sshd library version
+)Updated sshd version to 1.7.0 ++)Done necessary code changes. Issue-ID: CCSDK-386 Change-Id: I7272c52c845fac55025cda9e904c74e84cd004e0 Signed-off-by: arind.mondal <arind.mondal@samsung.com>
Diffstat (limited to 'saltstack-adapter/saltstack-adapter-provider/src')
-rw-r--r--saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SshConnection.java35
1 files changed, 17 insertions, 18 deletions
diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SshConnection.java b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SshConnection.java
index eb45ead50..25d2d8402 100644
--- a/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SshConnection.java
+++ b/saltstack-adapter/saltstack-adapter-provider/src/main/java/org/onap/ccsdk/sli/adaptors/saltstack/impl/SshConnection.java
@@ -24,21 +24,21 @@
package org.onap.ccsdk.sli.adaptors.saltstack.impl;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import org.apache.sshd.ClientChannel;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
+import java.io.OutputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.security.KeyPair;
+import org.apache.sshd.client.SshClient;
import org.apache.sshd.client.channel.ChannelExec;
import org.apache.sshd.client.future.AuthFuture;
import org.apache.sshd.client.future.OpenFuture;
-import org.apache.sshd.common.KeyPairProvider;
+import org.apache.sshd.client.session.ClientSession;
import org.apache.sshd.common.keyprovider.FileKeyPairProvider;
+import org.apache.sshd.common.keyprovider.KeyPairProvider;
import org.onap.ccsdk.sli.adaptors.saltstack.model.Constants;
import org.onap.ccsdk.sli.adaptors.saltstack.model.SshException;
-
-import java.io.OutputStream;
-import java.security.KeyPair;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
/**
* Implementation of SshConnection interface based on Apache MINA SSHD library.
@@ -79,16 +79,15 @@ class SshConnection {
sshClient.start();
try {
clientSession =
- sshClient.connect(username, host, port).await().getSession();
+ sshClient.connect(username, host, port).getSession();
if (password != null) {
clientSession.addPasswordIdentity(password);
- } else if (keyFile != null) {
- KeyPairProvider keyPairProvider = new FileKeyPairProvider(new String[]{
- keyFile
- });
- KeyPair keyPair = keyPairProvider.loadKeys().iterator().next();
- clientSession.addPublicKeyIdentity(keyPair);
- }
+ } else if (keyFile != null) {
+ Path keyFilePath = Paths.get(keyFile);
+ KeyPairProvider keyPairProvider = new FileKeyPairProvider(keyFilePath);
+ KeyPair keyPair = keyPairProvider.loadKeys().iterator().next();
+ clientSession.addPublicKeyIdentity(keyPair);
+ }
AuthFuture authFuture = clientSession.auth();
authFuture.await(AUTH_TIMEOUT);
if (!authFuture.isSuccess()) {
@@ -168,7 +167,7 @@ class SshConnection {
OpenFuture openFuture = client.open();
int exitStatus;
try {
- client.waitFor(ClientChannel.CLOSED, timeout);
+ client.wait(timeout);
openFuture.verify();
Integer exitStatusI = client.getExitStatus();
if (exitStatusI == null) {