Update SSH client integration

- Update command line array creation in sh.execute()
- Add ssh_command function to execute ssh client
- Remove pkey SSH connect parameter
- Fix recursive proxy-jump client creation
- Add ssh_host_config function
- Add connection attempts parameter
- Use connection timeout as single aptemt connection timeout

Change-Id: Ida109c2c4cd01151a73a70dfccb03b8392ae0a74
This commit is contained in:
Federico Ressi
2019-05-29 11:44:31 +02:00
parent d4a1f2b65a
commit eb28b035f5
9 changed files with 406 additions and 289 deletions

View File

@@ -0,0 +1,64 @@
# Copyright (c) 2019 Red Hat, Inc.
#
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from __future__ import absolute_import
import six
from tobiko.shell.ssh import _config
def ssh_login(hostname, username=None, port=None):
login = hostname
if port:
login += ':' + str(port)
if username:
login = username + '@' + login
return login
def ssh_command(host, username=None, port=None, command=None,
config_files=None, host_config=None, **options):
host_config = host_config or _config.ssh_host_config(
host=host, config_files=config_files)
command = command or host_config.default.command.split()
if isinstance(command, six.string_types):
command = command.split()
hostname = host_config.hostname
username = username or host_config.username
command += [ssh_login(hostname=hostname, username=username)]
if host_config.default.debug:
command += ['-vvvvvv']
port = port or host_config.port
if port:
command += ['-p', port]
for name, value in host_config.host_config.items():
if name not in {'hostname', 'port', 'user'}:
options.setdefault(name, value)
options.setdefault('userknownhostsfile', '/dev/null')
options.setdefault('stricthostkeychecking', 'no')
options.setdefault('loglevel', 'quiet')
options.setdefault('connecttimeout', int(host_config.timeout))
options.setdefault('connectionattempts', host_config.connection_attempts)
if options:
for name, value in sorted(options.items()):
command += ['-o', '{!s}={!s}'.format(name, value)]
return command