1 files changed, 57 insertions, 6 deletions

diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py
index 26d64fb..a1e1ba4 100644
--- a/rumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -43,6 +43,51 @@ def _print_stream(stream):
         return o
 
 
+def execute_proxy_commands(testbed, ssh_config, commands, time_out=3):
+    """
+    Remote execution of a list of shell command on hostname, using the
+    http and https proxy specified by the testbed. By
+    default this function will exit (timeout) after 3 seconds.
+
+    @param testbed: testbed info
+    @param ssh_config: ssh config of the node
+    @param commands: *nix shell command
+    @param time_out: time_out value in seconds, error will be generated if
+    no result received in given number of seconds, the value None can
+    be used when no timeout is needed
+    """
+    new_commands = []
+    for command in commands:
+        proxy = testbed.http_proxy
+        if proxy is not None:
+            proxy_command = 'export http_proxy=' + proxy + '; ' \
+                            + 'export https_proxy=' + proxy + ';'
+            new_commands.append(proxy_command + ' ' + command)
+        else:
+            new_commands.append(command)
+    return execute_commands(testbed, ssh_config, new_commands, time_out)
+
+
+def execute_proxy_command(testbed, ssh_config, command, time_out=3):
+    """
+    Remote execution of a list of shell command on hostname, using
+    a proxy http and https.
+    By default this function will exit (timeout) after 3 seconds.
+
+    @param testbed: testbed info
+    @param ssh_config: ssh config of the node
+    @param command: *nix shell command
+    @param time_out: time_out value in seconds, error will be generated if
+    no result received in given number of seconds, the value None can
+    be used when no timeout is needed
+
+    @return: stdout resulting from the command
+    """
+    o = execute_proxy_commands(testbed, ssh_config, [command], time_out)
+    if o is not None:
+        return o
+
+
 def execute_commands(testbed, ssh_config, commands, time_out=3):
     """
     Remote execution of a list of shell command on hostname. By
@@ -160,6 +205,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 +217,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()
 
@@ -224,9 +275,9 @@ def setup_vlan(testbed, node, vlan_id, int_name):
                  % args),
             sudo("ifconfig %(ifname)s.%(vlan)s up"
                  % args)]
-    # TODO: is ethtool needed? Should install or check if it is present.
-    # cmds += [sudo("ethtool -K %(ifname)s rxvlan off"
-    #               % args),
-    #          sudo("ethtool -K %(ifname)s txvlan off"
-    #               % args)]
+    if testbed.flags['no_vlan_offload']:
+        cmds += [sudo("ethtool -K %(ifname)s rxvlan off"
+                      % args),
+                 sudo("ethtool -K %(ifname)s txvlan off"
+                      % args)]
     execute_commands(testbed, node.ssh_config, cmds)