diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-11 19:12:53 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2017-04-11 19:12:53 +0200 |
| commit | f5f9fba3d6b657fd5daa31e4981c055a05c596e8 (patch) | |
| tree | def87ce8de8656f07cf9f79b209d794f5414b0c1 /rumba/prototypes/ouroboros.py | |
| parent | 662c33bf7ce9ddf3bcc77f7d5f51c958d2b837ad (diff) | |
| download | rumba-f5f9fba3d6b657fd5daa31e4981c055a05c596e8.tar.gz rumba-f5f9fba3d6b657fd5daa31e4981c055a05c596e8.zip | |
ssh_support: Pass SSHConfig instead of only hostname
Only the hostname was passed to the ssh_support component. This passes
an object that can also hold the port number. It can be extended to
take other things as well, such as a proxy.
Diffstat (limited to 'rumba/prototypes/ouroboros.py')
| -rw-r--r-- | rumba/prototypes/ouroboros.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index 00fdb6b..4fdacd6 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -37,7 +37,7 @@ class Experiment(mod.Experiment): cmds.append("sudo nohup irmd > /dev/null &") for node in self.nodes: - ssh.execute_commands(self.testbed, node.full_name, + ssh.execute_commands(self.testbed, node.ssh_config, cmds, time_out=None) return @@ -47,7 +47,7 @@ class Experiment(mod.Experiment): for name, ap in node.bindings.items(): cmds.append("irm b ap " + ap + " n " + name) - ssh.execute_commands(self.testbed, node.full_name, + ssh.execute_commands(self.testbed, node.ssh_config, cmds, time_out = None) def reg_names(self): @@ -59,7 +59,7 @@ class Experiment(mod.Experiment): cmd += " dif " + dif.name cmds.append(cmd) - ssh.execute_commands(self.testbed, node.full_name, cmds, + ssh.execute_commands(self.testbed, node.ssh_config, cmds, time_out = None) def create_ipcps(self): @@ -104,7 +104,7 @@ class Experiment(mod.Experiment): for cmd in cmds2: cmds.append(cmd) - ssh.execute_commands(self.testbed, node.full_name, cmds, + ssh.execute_commands(self.testbed, node.ssh_config, cmds, time_out = None) def enroll_ipcps(self): @@ -127,7 +127,7 @@ class Experiment(mod.Experiment): cmds.append(cmd) ssh.execute_commands(self.testbed, - e['enrollee'].full_name, + e['enrollee'].ssh_config, cmds, time_out = None) time.sleep(2) |