openstack
/
fuel-devops
Code Issues Proposed changes

SSHAuth object: copy into SSHClient instance on create 

SSHAuth object: copy into SSHClient instance on create:
this fix issue, when as result we will have 1 instance of SSHAuth object
for multiple connections.

Change-Id: Ie4160baa0edd8bd9ea4b4690ae68f10e9839d16c
This commit is contained in:
Alexey Stepanov 2016-08-19 14:03:39 +03:00 committed by Dennis Dmitriev
parent 48fcf848a5
commit a34dc163b6
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
devops/helpers/ssh_client.py
View File

@ -156,6 +156,17 @@ class SSHAuth(object):
def __eq__(self, other):
return hash(self) == hash(other)
def __deepcopy__(self):
return self.__class__(
username=self.username,
password=self.__password,
key=self.__key,
keys=self.__keys
)
def copy(self):
return self.__deepcopy__()
def __repr__(self):
_key = (
None if self.__key is None else
@ -304,23 +315,6 @@ class SSHClient(six.with_metaclass(_MemorizedSSH, object)):
'__lock'
]
class get_sudo(object):
"""Context manager for call commands with sudo"""
def __init__(self, ssh):
warn(
'SSHClient.get_sudo(SSHClient()) is deprecated in favor of '
'SSHClient().sudo(enforce=...) , which is much more powerful.')
self.ssh = ssh
self.__sudo_status = False
def __enter__(self):
self.__sudo_status = self.ssh.sudo_mode
self.ssh.sudo_mode = True
def __exit__(self, exc_type, exc_val, exc_tb):
self.ssh.sudo_mode = self.__sudo_status
class __get_sudo(object):
"""Context manager for call commands with sudo"""
def __init__(self, ssh, enforce=None):
@ -341,6 +335,16 @@ class SSHClient(six.with_metaclass(_MemorizedSSH, object)):
def __exit__(self, exc_type, exc_val, exc_tb):
self.__ssh.sudo_mode = self.__sudo_status
# noinspection PyPep8Naming
class get_sudo(__get_sudo):
"""Context manager for call commands with sudo"""
def __init__(self, ssh, enforce=True):
warn(
'SSHClient.get_sudo(SSHClient()) is deprecated in favor of '
'SSHClient().sudo(enforce=...) , which is much more powerful.')
super(self.__class__, self).__init__(ssh=ssh, enforce=enforce)
def __hash__(self):
return hash((
self.__class__,
@ -373,7 +377,7 @@ class SSHClient(six.with_metaclass(_MemorizedSSH, object)):
self.__ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
self.__sftp = None
self.__auth = auth
self.__auth = auth if auth is None else auth.copy()
if auth is None:
msg = (