ssh_support: added proxy_command to copy path to testbed

other:
fix to democonf2rumba jfed arguments

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()