smoketest: move SSH login functionality to base class

1 files changed, 2 insertions, 14 deletions

diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py
index 8de98f34f..e03907dd8 100755
--- a/smoketest/scripts/cli/test_service_ssh.py
+++ b/smoketest/scripts/cli/test_service_ssh.py
@@ -174,18 +174,6 @@ class TestServiceSSH(VyOSUnitTestSHIM.TestCase):
         #
         # We also try to login as an invalid user - this is not allowed to work.
 
-        def ssh_send_cmd(command, username, password, host='localhost'):
-            """ SSH command execution helper """
-            # Try to login via SSH
-            ssh_client = paramiko.SSHClient()
-            ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-            ssh_client.connect(hostname='localhost', username=username, password=password)
-            _, stdout, stderr = ssh_client.exec_command(command)
-            output = stdout.read().decode().strip()
-            error = stderr.read().decode().strip()
-            ssh_client.close()
-            return output, error
-
         test_user = 'ssh_test'
         test_pass = 'v2i57DZs8idUwMN3VC92'
         test_command = 'uname -a'
@@ -197,14 +185,14 @@ class TestServiceSSH(VyOSUnitTestSHIM.TestCase):
         self.cli_commit()
 
         # Login with proper credentials
-        output, error = ssh_send_cmd(test_command, test_user, test_pass)
+        output, error = self.ssh_send_cmd(test_command, test_user, test_pass)
         # verify login
         self.assertFalse(error)
         self.assertEqual(output, cmd(test_command))
 
         # Login with invalid credentials
         with self.assertRaises(paramiko.ssh_exception.AuthenticationException):
-            output, error = ssh_send_cmd(test_command, 'invalid_user', 'invalid_password')
+            output, error = self.ssh_send_cmd(test_command, 'invalid_user', 'invalid_password')
 
         self.cli_delete(['system', 'login', 'user', test_user])
         self.cli_commit()