diff options
author | Marco Capitani <m.capitani@nextworks.it> | 2017-04-28 12:04:44 +0200 |
---|---|---|
committer | Marco Capitani <m.capitani@nextworks.it> | 2017-04-28 12:13:31 +0200 |
commit | da965f80da37c2b775e1e62e469589a3be05da30 (patch) | |
tree | 0fcf67801b9417b572c18a5892b76ad4fef50926 /rumba/ssh_support.py | |
parent | 200e920ec04164ed3d96f034082efd9464287f7a (diff) | |
download | rumba-da965f80da37c2b775e1e62e469589a3be05da30.tar.gz rumba-da965f80da37c2b775e1e62e469589a3be05da30.zip |
ssh_support: added proxy_command to copy path to testbed
other:
fix to democonf2rumba jfed arguments
Diffstat (limited to 'rumba/ssh_support.py')
-rw-r--r-- | rumba/ssh_support.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index 26d64fb..cb36910 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -160,6 +160,11 @@ def copy_paths_to_testbed(testbed, ssh_config, paths, destination): """ ssh_client = get_ssh_client() + if ssh_config.proxycommand is not None: + proxy = paramiko.ProxyCommand(ssh_config.proxycommand) + else: + proxy = None + if destination is not '' and not destination.endswith('/'): destination = destination + '/' @@ -167,7 +172,8 @@ def copy_paths_to_testbed(testbed, ssh_config, paths, destination): ssh_client.connect(ssh_config.hostname, ssh_config.port, testbed.username, testbed.password, - look_for_keys=True) + look_for_keys=True, + sock=proxy) sftp_client = ssh_client.open_sftp() |