aboutsummaryrefslogtreecommitdiff
path: root/rumba/ssh_support.py
diff options
context:
space:
mode:
authorMarco Capitani <m.capitani@nextworks.it>2017-06-30 12:17:16 +0200
committerMarco Capitani <m.capitani@nextworks.it>2017-06-30 12:17:16 +0200
commit815839bf3cac2fcfd2d25a69395055397d55a8bb (patch)
tree128c5acaf009245b87c982ae7e85041c39afee98 /rumba/ssh_support.py
parent50f0edfca9b552d332d250022e0d8c5fdaa531c7 (diff)
downloadrumba-815839bf3cac2fcfd2d25a69395055397d55a8bb.tar.gz
rumba-815839bf3cac2fcfd2d25a69395055397d55a8bb.zip
ssh & model-storyboard: changed ssh API, added node.execute* methods
Diffstat (limited to 'rumba/ssh_support.py')
-rw-r--r--rumba/ssh_support.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py
index b0970e1..e785f33 100644
--- a/rumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -102,8 +102,8 @@ def execute_commands(testbed, ssh_config, commands, time_out=3):
"""
ssh_client = get_ssh_client()
- if ssh_config.proxycommand is not None:
- proxy = paramiko.ProxyCommand(ssh_config.proxycommand)
+ if ssh_config.proxy_command is not None:
+ proxy = paramiko.ProxyCommand(ssh_config.proxy_command)
else:
proxy = None
@@ -162,8 +162,8 @@ def copy_file_to_testbed(testbed, ssh_config, text, file_name):
"""
ssh_client = get_ssh_client()
- if ssh_config.proxycommand is not None:
- proxy = paramiko.ProxyCommand(ssh_config.proxycommand)
+ if ssh_config.proxy_command is not None:
+ proxy = paramiko.ProxyCommand(ssh_config.proxy_command)
else:
proxy = None
@@ -205,8 +205,8 @@ 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)
+ if ssh_config.proxy_command is not None:
+ proxy = paramiko.ProxyCommand(ssh_config.proxy_command)
else:
proxy = None