cloudshell-cli 4.0.6__py2.py3-none-any.whl → 4.1.2__py2.py3-none-any.whl

cloudshell/cli/configurator.py

@@ -2,7 +2,13 @@
 # -*- coding: utf-8 -*-
 import sys
 from abc import ABCMeta, abstractmethod
+from collections import defaultdict
 
+from cloudshell.cli.factory.session_factory import (
+    CloudInfoAccessKeySessionFactory,
+    GenericSessionFactory,
+    SessionFactory,
+)
 from cloudshell.cli.service.cli import CLI
 from cloudshell.cli.session.ssh_session import SSHSession
 from cloudshell.cli.session.telnet_session import TelnetSession
@@ -16,39 +22,33 @@ else:
 
 
 class CLIServiceConfigurator(object):
-    REGISTERED_SESSIONS = (SSHSession, TelnetSession)
-
-    def __init__(self, resource_config, logger, cli=None, registered_sessions=None):
+    REGISTERED_SESSIONS = (CloudInfoAccessKeySessionFactory(SSHSession), TelnetSession)
+    """Using factories instead of """
+
+    def __init__(
+        self,
+        resource_config,
+        logger,
+        cli=None,
+        registered_sessions=None,
+        access_key=None,
+        access_key_passphrase=None,
+    ):
         """Initialize CLI service configurator.
 
         :param cloudshell.shell.standards.resource_config_generic_models.GenericCLIConfig resource_config:  # noqa: E501
         :param logging.Logger logger:
         :param cloudshell.cli.service.cli.CLI cli:
         :param registered_sessions: Session types and order
+        :param access_key: access key for the resource
+        :param access_key_passphrase: access key passphrase for the resource
         """
         self._cli = cli or CLI()
         self._resource_config = resource_config
         self._logger = logger
         self._registered_sessions = registered_sessions or self.REGISTERED_SESSIONS
-
-    @property
-    def _username(self):
-        return self._resource_config.user
-
-    @property
-    @lru_cache()
-    def _password(self):
-        return self._resource_config.password
-
-    @property
-    def _resource_address(self):
-        """Resource IP."""
-        return self._resource_config.address
-
-    @property
-    def _port(self):
-        """Connection port property, to open socket on."""
-        return self._resource_config.cli_tcp_port
+        self._access_key = access_key
+        self._access_key_passphrase = access_key_passphrase
 
     @property
     def _cli_type(self):
@@ -58,29 +58,28 @@ class CLIServiceConfigurator(object):
     @property
     @lru_cache()
     def _session_dict(self):
-        return {sess.SESSION_TYPE.lower(): [sess] for sess in self._registered_sessions}
+        session_dict = defaultdict(list)
+        for sess in self._registered_sessions:
+            session_dict[sess.SESSION_TYPE.lower()].append(sess)
+        return session_dict
 
     def _on_session_start(self, session, logger):
-        """Perform some default commands when session just opened.
-
-        Like 'no logging console'
-        """
         pass
 
-    @property
-    @lru_cache()
-    def _session_kwargs(self):
-        return {
-            "host": self._resource_address,
-            "username": self._username,
-            "password": self._password,
-            "port": self._port,
-            "on_session_start": self._on_session_start,
-        }
+    def initialize_session(self, session):
+        if not isinstance(session, SessionFactory):
+            session = GenericSessionFactory(session)
+        return session.init_session(
+            self._resource_config,
+            self._logger,
+            on_session_start=self._on_session_start,
+            access_key=self._access_key,
+            access_key_passphrase=self._access_key_passphrase,
+        )
 
     def _defined_sessions(self):
         return [
-            sess(**self._session_kwargs)
+            self.initialize_session(sess)
             for sess in self._session_dict.get(
                 self._cli_type.lower(), self._registered_sessions
             )

cloudshell/cli/examples/cli_demo/connect_to_switch/SwitchClihandler.py

@@ -96,7 +96,6 @@ class SwitchCliHandler(CliHandlerImpl):
         session.hardware_expect("exit", EnableCommandMode.PROMPT, logger)
 
     def enter_enable_mode(self, session, logger):
-
         enable_password = get_attribute_by_name(
             attribute_name="Enable Password", context=self._context
         )

cloudshell/cli/examples/cli_demo/connect_to_ubuntu/runnur.py

@@ -13,7 +13,6 @@ class CliCommandMode(CommandMode):
     EXIT_COMMAND = "exit"
 
     def __init__(self, context):
-
         CommandMode.__init__(
             self,
             CliCommandMode.PROMPT,

cloudshell/cli/factory/session_factory.py

@@ -0,0 +1,96 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+from abc import ABCMeta, abstractmethod
+
+ABC = ABCMeta("ABC", (object,), {"__slots__": ()})
+
+
+class SessionFactory(ABC):
+    """Session factory.
+
+    Help to initialize session for specified session class.
+    """
+
+    def __init__(self, session_class):
+        """:param session_class: Session class."""
+        self.session_class = session_class
+
+    @abstractmethod
+    def init_session(
+        self,
+        resource_config,
+        logger,
+        on_session_start=None,
+        access_key=None,
+        access_key_passphrase=None,
+    ):
+        """Initialize session instance.
+
+        Encapsulate the logic of the session instance creation.
+        :param resource_config:
+        :param logging.Logger logger:
+        :param on_session_start: function that will be called on session start
+        :param access_key: access key for the resource
+        :param access_key_passphrase: access key passphrase for the resource
+        """
+        raise NotImplementedError
+
+
+class GenericSessionFactory(SessionFactory):
+    def init_session(
+        self,
+        resource_config,
+        logger,
+        on_session_start=None,
+        access_key=None,
+        access_key_passphrase=None,
+    ):
+        return self.session_class(
+            **self._session_kwargs(
+                resource_config,
+                logger,
+                on_session_start,
+                access_key,
+                access_key_passphrase,
+            )
+        )
+
+    @property
+    def SESSION_TYPE(self):
+        return self.session_class.SESSION_TYPE
+
+    def _session_kwargs(
+        self,
+        resource_config,
+        logger,
+        on_session_start,
+        access_key,
+        access_key_passphrase,
+    ):
+        return {
+            "host": resource_config.address,
+            "username": resource_config.user,
+            "password": resource_config.password,
+            "port": resource_config.cli_tcp_port,
+            "on_session_start": on_session_start,
+        }
+
+
+class CloudInfoAccessKeySessionFactory(GenericSessionFactory):
+    def _session_kwargs(
+        self,
+        resource_config,
+        logger,
+        on_session_start,
+        access_key,
+        access_key_passphrase,
+    ):
+        return {
+            "host": resource_config.address,
+            "username": resource_config.user,
+            "password": resource_config.password,
+            "port": resource_config.cli_tcp_port,
+            "pkey": access_key,
+            "pkey_passphrase": access_key_passphrase,
+            "on_session_start": on_session_start,
+        }

cloudshell/cli/service/command_mode_helper.py

@@ -35,7 +35,7 @@ class CommandModeHelper(NodeOperations):
 
         :rtype: OrderedDict
         """
-        # noqa
+
         def _get_child_nodes(command_node):
             return reduce(
                 lambda x, y: x + _get_child_nodes(y),
@@ -60,7 +60,7 @@ class CommandModeHelper(NodeOperations):
 
         :rtype: dict
         """
-        # noqa
+
         def _create_child_modes(instance, child_dict):
             instance_dict = {}
             for mode_type in child_dict:

cloudshell/cli/session/expect_session.py

@@ -308,7 +308,6 @@ class ExpectSession(Session, ABC):
             self._loop_detector_max_combination_length,
         )
         while retries == 0 or retries_count < retries:
-
             read_buffer = self._receive_all(timeout, logger)
 
             if read_buffer:

cloudshell/cli/session/scpi_session.py

@@ -38,7 +38,6 @@ class SCPISession(TCPSession):
         remove_command_from_output=True,
         **optional_args
     ):
-
         if ";:system:error?" not in command.lower():
             command += ";:system:error?"
 

cloudshell/cli/session/ssh_session.py

@@ -1,3 +1,5 @@
+from io import StringIO
+
 import paramiko
 from scp import SCPClient
 
@@ -22,6 +24,7 @@ class SSHSession(ExpectSession, ConnectionParams):
         port=None,
         on_session_start=None,
         pkey=None,
+        pkey_passphrase=None,
         *args,
         **kwargs
     ):
@@ -36,6 +39,7 @@ class SSHSession(ExpectSession, ConnectionParams):
         self.username = username
         self.password = password
         self.pkey = pkey
+        self.pkey_passphrase = pkey_passphrase
 
         self._handler = None
         self._current_channel = None
@@ -52,6 +56,7 @@ class SSHSession(ExpectSession, ConnectionParams):
                 self.username == other.username,
                 self.password == other.password,
                 self.pkey == other.pkey,
+                self.pkey_passphrase == other.pkey_passphrase,
             ]
         )
 
@@ -80,7 +85,7 @@ class SSHSession(ExpectSession, ConnectionParams):
                 banner_timeout=30,
                 allow_agent=False,
                 look_for_keys=False,
-                pkey=self.pkey,
+                pkey=self._get_pkey_object(self.pkey, self.pkey_passphrase, logger),
             )
         except Exception as e:
             logger.exception("Failed to initialize session:")
@@ -161,3 +166,18 @@ class SSHSession(ExpectSession, ConnectionParams):
         sftp.putfo(file_stream, dest_pathname)
         sftp.chmod(dest_pathname, int(dest_permissions, base=8))
         sftp.close()
+
+    @staticmethod
+    def _get_pkey_object(key_material, passphrase, logger):
+        """Try to detect private key type and return paramiko.PKey object."""
+        if not key_material:
+            return None
+
+        for cls in [paramiko.RSAKey, paramiko.DSSKey, paramiko.ECDSAKey]:
+            try:
+                key = cls.from_private_key(StringIO(key_material), password=passphrase)
+            except paramiko.ssh_exception.SSHException as e:
+                # Invalid key, try other key type
+                logger.warning(e)
+            else:
+                return key

cloudshell/cli/session/tcp_session.py

@@ -5,7 +5,6 @@ from cloudshell.cli.session.expect_session import ExpectSession
 
 
 class TCPSession(ExpectSession, ConnectionParams):
-
     SESSION_TYPE = "TCP"
     BUFFER_SIZE = 1024
 

cloudshell/cli/session/telnet_session.py

@@ -99,4 +99,4 @@ class TelnetSession(ExpectSession, ConnectionParams):
         self._handler.get_socket().settimeout(timeout)
 
     def _read_byte_data(self):
-        self._handler.read_some()
+        return self._handler.read_some()

{cloudshell_cli-4.0.6.dist-info → cloudshell_cli-4.1.2.dist-info}/METADATA

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: cloudshell-cli
-Version: 4.0.6
+Version: 4.1.2
 Summary: QualiSystems CloudShell CLI support package
 Home-page: http://www.qualisystems.com/
 Author: QualiSystems
 Author-email: info@qualisystems.com
-License: UNKNOWN
-Platform: UNKNOWN
 Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*, <4
 License-File: LICENSE
 Requires-Dist: paramiko (<2.7,>=2.6)
@@ -20,5 +18,4 @@ Requires-Dist: cryptography (<37,>=3.3) ; python_version > "3.7"
 Requires-Dist: PyNaCl (>=1.5) ; python_version > "3.7"
 Requires-Dist: six ; python_version > "3.7"
 
-UNKNOWN
-
+QualiSystems CloudShell CLI support package

{cloudshell_cli-4.0.6.dist-info → cloudshell_cli-4.1.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cloudshell/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 cloudshell/cli/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 cloudshell/cli/cli.py,sha256=R8DLCNeHyLF45q8EOOZTUrHtH_aE3mkxKon44GnND_I,376
-cloudshell/cli/configurator.py,sha256=TkYgIGKRAL0PEFG3CHVQ7SsWdMH-LqHcOpbW97gQEgY,3583
+cloudshell/cli/configurator.py,sha256=_rMD7YC23tH4HE47Pbq6bK-gV5VKNJp2mnYxMCPi3lI,3810
 cloudshell/cli/session_pool_context_manager.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudshell/cli/command_template/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 cloudshell/cli/command_template/command_template.py,sha256=WEIkA2JzdIbRl5d_2n28PdTwFmUzefvkpqNvSvVUTfA,1909
@@ -10,19 +10,21 @@ cloudshell/cli/examples/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 cloudshell/cli/examples/cli_demo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudshell/cli/examples/cli_demo/connect_to_AWS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudshell/cli/examples/cli_demo/connect_to_AWS/runnur.py,sha256=9Eu-CIJBfkLvIbPkDbGGg3TL5KsXh3JHIILVRmsdyMs,1550
-cloudshell/cli/examples/cli_demo/connect_to_switch/SwitchClihandler.py,sha256=liJpxVA7yl_6EziTB2e-yvK1_jShRvpQoeb1z5HpUrk,4349
+cloudshell/cli/examples/cli_demo/connect_to_switch/SwitchClihandler.py,sha256=_Sp5Mz2kZSgz3mkHOUNF6r5DGaFiGIW7VEZPtaRwr1M,4348
 cloudshell/cli/examples/cli_demo/connect_to_switch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudshell/cli/examples/cli_demo/connect_to_switch/runner.py,sha256=O6q2d2OohQebK1cXNiUI82HHuVhMwLyLH-IOya7arTw,1662
 cloudshell/cli/examples/cli_demo/connect_to_ubuntu/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudshell/cli/examples/cli_demo/connect_to_ubuntu/readfrom.txt,sha256=wiGZ60IyMGEV8vKebN8xJkJ66DeOm_c2TsRwxmg70xQ,3104
-cloudshell/cli/examples/cli_demo/connect_to_ubuntu/runnur.py,sha256=UbenZbxu67_rMh3G7g53r_3nNE4r0EXjhNU6sQh7qEc,1515
+cloudshell/cli/examples/cli_demo/connect_to_ubuntu/runnur.py,sha256=AsHKNWW2EUDymdRgjVHvUfZtYAmU9CJrQd4zDYZGDtg,1514
+cloudshell/cli/factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cloudshell/cli/factory/session_factory.py,sha256=Le49pA3q-xI7awM7MRhC3J6ahLusjMpG15wrntJBFyY,2601
 cloudshell/cli/service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudshell/cli/service/cli.py,sha256=W0ET3ATrarXuyMV7rd6-0CaKd9hn6VSuiu8hKeIqrjM,1024
 cloudshell/cli/service/cli_exception.py,sha256=xa-vFfGzUjkHFQ_3R84hgfhQ0bLLSfawFU_Y9fzn3eg,62
 cloudshell/cli/service/cli_service.py,sha256=Opf4eDqWMiEn8AqEtc9TbT0cfvs3BjmL7STv80sOOGc,739
 cloudshell/cli/service/cli_service_impl.py,sha256=es8xWFlcGb1MOr5MQVH8sSdC9GNbofZpS-sNoCXR_hQ,5542
 cloudshell/cli/service/command_mode.py,sha256=i3FOBFWEt_pcJjdiN-IZzlmy_FCsNl-EB5vM2t1w6oY,6425
-cloudshell/cli/service/command_mode_helper.py,sha256=u7lOI2tvAZ8026m81RCpFr0wFbMCQlJnD-SO_uFrlLM,2634
+cloudshell/cli/service/command_mode_helper.py,sha256=5hiYGvatlKXspXnyfx_8DAl4GBJbzqmfOsxLwZCMvWo,2606
 cloudshell/cli/service/node.py,sha256=L6LcZKKHELmVDX9DW7TToOEHY5pm_7YeYuxVqESFXWA,1987
 cloudshell/cli/service/session_manager.py,sha256=iLO7aEglkqY3eVTocIyYqb569KvCum9zkKglxgBgc_I,711
 cloudshell/cli/service/session_manager_impl.py,sha256=FabZWrbLzW_7rAkbTUdDeddaIcZGE7mpesMmDK9OFcE,2290
@@ -31,13 +33,13 @@ cloudshell/cli/service/session_pool_context_manager.py,sha256=jK_dNX1i0fCkm6SoCg
 cloudshell/cli/service/session_pool_manager.py,sha256=yt-2loMkR1h3dwBovXzFV6D4AmNqI3kQr6m6sZ4t7vo,4449
 cloudshell/cli/session/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 cloudshell/cli/session/connection_params.py,sha256=dELSeIeGb8dXIbUDfCUTXkEvNTdhCp66caGsqiV85kE,1122
-cloudshell/cli/session/expect_session.py,sha256=ReY0uqDsCm4cXeHvH_8DWMTRLrBcTmu65wXD6-BkA5M,15053
-cloudshell/cli/session/scpi_session.py,sha256=8hBSMTYnwecICn6tCPruE7bPD5dGVSyqwv1GfEpnASw,2023
+cloudshell/cli/session/expect_session.py,sha256=6VDSoAhfX7THgeaQP8aDmtPjMNEY_SOz3OzrsC4nC5A,15052
+cloudshell/cli/session/scpi_session.py,sha256=GKG9XiE1wL1mfnZRDhpkPfFy56gAr05gphECODhQR2s,2022
 cloudshell/cli/session/session.py,sha256=cfwFUKhhZmUvtXUSZcZbpvIqmOvwCoYvfDAbzC3NeAw,1247
 cloudshell/cli/session/session_exceptions.py,sha256=b6xHCJlQ7zXrESbG6DJvFQ8q_JE_OAZHZ2rHya9M62g,430
-cloudshell/cli/session/ssh_session.py,sha256=U-4CKMdsKFDQ2jMgwZ21bmlrxVgFHe24EFThRjmAa5s,4993
-cloudshell/cli/session/tcp_session.py,sha256=ZmfxCFwZ04lqVzSf7vPOPyP98KNolxry9ECO-vx_ooQ,1569
-cloudshell/cli/session/telnet_session.py,sha256=mEeOV7jFugzVxyT82gWkh7Ok6oDtJC0wQmy4Pdp0g5Y,2891
+cloudshell/cli/session/ssh_session.py,sha256=hjrGTJF9Jl8VlwS8-BuGdMFqtHS5KxvVRzF7nPEyADk,5791
+cloudshell/cli/session/tcp_session.py,sha256=q_T7TkvmYDl5kaTTIUKL2Zaxzg-hnJMfOAUDxpRCPB8,1568
+cloudshell/cli/session/telnet_session.py,sha256=q7FzaGvJYGX-zkAWLfXj0_ppvTjWVF825SlDOR9Pu_0,2898
 cloudshell/cli/session/tl1_session.py,sha256=IxOl7Mtu2cw-lnKjmanqI-IVx2-PWYRTtOPPimSwRDU,3244
 cloudshell/cli/session/helper/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
 cloudshell/cli/session/helper/normalize_buffer.py,sha256=WHjiasTXOPr4bLM3X_rf2sFGYNw35Q2eSrH2RiJWbPs,798
@@ -58,10 +60,10 @@ tests/cli/session/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk
 tests/cli/session/test_connection_params.py,sha256=qyxVfD990VMzb8Yi9lLkEVpVOFjpxXLhxvsXRLZniFI,2234
 tests/cli/session/test_expect_session.py,sha256=pg9Nz7dDRLTY-sFIn_ikaDi-wHc9iqZ1ZZeiwN2acFE,14848
 tests/cli/session/test_expect_session_py3.py,sha256=14QxAFJTN6F-jYYnXskoVhAjM9sBBqMe1y2Run7a_FI,387
-tests/cli/session/test_ssh_session.py,sha256=K5Xulu_M7ziuROcm1A6piR0Bz4HugYAOgdJdxhgpksg,21836
+tests/cli/session/test_ssh_session.py,sha256=GVdzlSN22zuiZuJLmgoq3Yus3Nt94QDR4iUPyPBRauo,21772
 tests/cli/session/test_telnet_session.py,sha256=Yrg7KeYn-piIuMLAwPP80HkFIafDxJrTIue5u7BXnPc,3802
-cloudshell_cli-4.0.6.dist-info/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
-cloudshell_cli-4.0.6.dist-info/METADATA,sha256=6Bgt3TEsPLrVIAOhjRNeTQvWucI70hNMLeXNOyEd5UM,897
-cloudshell_cli-4.0.6.dist-info/WHEEL,sha256=z9j0xAa_JmUKMpmz72K0ZGALSM_n-wQVmGbleXx2VHg,110
-cloudshell_cli-4.0.6.dist-info/top_level.txt,sha256=L6C4-nnYVKqlsqCQ3HQ98myc8tI977N4Jxb-DHJSECc,17
-cloudshell_cli-4.0.6.dist-info/RECORD,,
+cloudshell_cli-4.1.2.dist-info/LICENSE,sha256=xllut76FgcGL5zbIRvuRc7aezPbvlMUTWJPsVr2Sugg,11358
+cloudshell_cli-4.1.2.dist-info/METADATA,sha256=G-sSMTqRijqZ6dk1CY8o2mFwttRNoZEdmqeG3MCLM2k,897
+cloudshell_cli-4.1.2.dist-info/WHEEL,sha256=bb2Ot9scclHKMOLDEHY6B2sicWOgugjFKaJsT7vwMQo,110
+cloudshell_cli-4.1.2.dist-info/top_level.txt,sha256=L6C4-nnYVKqlsqCQ3HQ98myc8tI977N4Jxb-DHJSECc,17
+cloudshell_cli-4.1.2.dist-info/RECORD,,

{cloudshell_cli-4.0.6.dist-info → cloudshell_cli-4.1.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.38.4)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

tests/cli/session/test_ssh_session.py

@@ -443,9 +443,6 @@ class TestSshSession(TestCase):
             )
         )
 
-        pkey = paramiko.RSAKey.from_private_key(
-            StringIO(KEY_WITH_PASSPHRASE), password=KEY_PASSPHRASE
-        )
         self.assertFalse(
             self._instance.__eq__(
                 SSHSession(
@@ -454,23 +451,22 @@ class TestSshSession(TestCase):
                     "",
                     port=self._port,
                     on_session_start=self._on_session_start,
-                    pkey=pkey,
+                    pkey=KEY_WITH_PASSPHRASE,
+                    pkey_passphrase=KEY_PASSPHRASE,
                 )
             )
         )
 
     @patch("cloudshell.cli.session.ssh_session.ExpectSession")
     def test_eq_rsa(self, expect_session):
-        pkey = paramiko.RSAKey.from_private_key(
-            StringIO(KEY_WITH_PASSPHRASE), password=KEY_PASSPHRASE
-        )
         self._instance = SSHSession(
             self._hostname,
             self._username,
             self._password,
             port=self._port,
             on_session_start=self._on_session_start,
-            pkey=pkey,
+            pkey=KEY_WITH_PASSPHRASE,
+            pkey_passphrase=KEY_PASSPHRASE,
         )
 
         self.assertTrue(
@@ -481,7 +477,8 @@ class TestSshSession(TestCase):
                     self._password,
                     port=self._port,
                     on_session_start=self._on_session_start,
-                    pkey=pkey,
+                    pkey=KEY_WITH_PASSPHRASE,
+                    pkey_passphrase=KEY_PASSPHRASE,
                 )
             )
         )
@@ -640,16 +637,13 @@ class TestSshSession(TestCase):
             "",
             port=server.port,
             on_session_start=self._on_session_start,
-            pkey=pkey,
+            pkey=KEY_WITH_PASSPHRASE,
+            pkey_passphrase=KEY_PASSPHRASE,
         )
         self._instance.connect(">", logger=Mock())
         self._instance.hardware_expect("dummy command", ">", Mock())
 
     def test_rsa_failure(self):
-        pkey = paramiko.RSAKey.from_private_key(
-            StringIO(KEY_WITH_PASSPHRASE), password=KEY_PASSPHRASE
-        )
-
         server = SSHServer(user2key={})
 
         with self.assertRaises(SSHSessionException):
@@ -659,7 +653,8 @@ class TestSshSession(TestCase):
                 "",
                 port=server.port,
                 on_session_start=self._on_session_start,
-                pkey=pkey,
+                pkey=KEY_WITH_PASSPHRASE,
+                pkey_passphrase=KEY_PASSPHRASE,
             )
             self._instance.connect(">", logger=Mock())
             self._instance.hardware_expect("dummy command", ">", Mock())