x/tobiko
Code Issues Proposed changes

Merge "Allow to create SSH client using netaddr.IPAddress instance"

Browse Source
This commit is contained in:
Zuul 2019-11-12 19:51:51 +00:00 committed by Gerrit Code Review
commit 8727bd4efe
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tobiko/shell/ssh/_client.py
View File

@ -23,8 +23,9 @@ import socket
import time import time
import subprocess import subprocess
import paramiko import netaddr
from oslo_log import log from oslo_log import log
import paramiko
import six import six
import tobiko import tobiko
@ -371,6 +372,8 @@ class SSHClientManager(object):
def get_client(self, host, username=None, port=None, proxy_jump=None, def get_client(self, host, username=None, port=None, proxy_jump=None,
host_config=None, config_files=None, proxy_client=None, host_config=None, config_files=None, proxy_client=None,
**connect_parameters): **connect_parameters):
if isinstance(host, netaddr.IPAddress):
host = str(host)
host_config = host_config or _config.ssh_host_config( host_config = host_config or _config.ssh_host_config(
host=host, config_files=config_files) host=host, config_files=config_files)
hostname = host_config.hostname hostname = host_config.hostname
@ -440,8 +443,7 @@ def ssh_connect(hostname, username=None, port=None, connection_interval=None,
if attempt >= attempts: if attempt >= attempts:
raise raise
LOG.debug("Error logging in to %r: \n(%s)", login, ex, LOG.debug("Error logging in to %r: %s", login, ex)
exc_info=1)
sleep_time = start_time + interval - time.time() sleep_time = start_time + interval - time.time()
if sleep_time > 0.: if sleep_time > 0.:
LOG.debug("Retrying connecting to %r in %d seconds...", login, LOG.debug("Retrying connecting to %r in %d seconds...", login,