diff options
author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-07-28 10:07:31 +0000 |
---|---|---|
committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-07-28 10:07:31 +0000 |
commit | f3f51c550ef9751bada8ffcd4d4e846c786a26e0 (patch) | |
tree | b6cddc451fc182e0bd3384805f4ae705375f043b /rumba/testbeds/emulab.py | |
parent | 7b43f02b415968371f1b5719232bd7741cb7f12f (diff) | |
parent | 7dc3b5086d4c1d19c9ef315369f3fd7c4dd2889e (diff) | |
download | rumba-f3f51c550ef9751bada8ffcd4d4e846c786a26e0.tar.gz rumba-f3f51c550ef9751bada8ffcd4d4e846c786a26e0.zip |
Merge branch 'storyboard-impl' into 'master'
Storyboard impl
See merge request !61
Diffstat (limited to 'rumba/testbeds/emulab.py')
-rw-r--r-- | rumba/testbeds/emulab.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py index e7458bc..53eebe5 100644 --- a/rumba/testbeds/emulab.py +++ b/rumba/testbeds/emulab.py @@ -131,7 +131,7 @@ class Testbed(mod.Testbed): ns = self.generate_ns_script(experiment) dest_file_name = '/users/' + self.username + \ '/temp_ns_file.%s.ns' % os.getpid() - ssh.copy_file_to_testbed(self, self.ops_ssh_config, ns, dest_file_name) + ssh.write_text_to_file(self, self.ops_ssh_config, ns, dest_file_name) cmd = '/usr/testbed/bin/sslxmlrpc_client.py startexp ' + \ 'batch=false wait=true proj="' + proj_name + \ @@ -210,6 +210,8 @@ class Testbed(mod.Testbed): for node in experiment.nodes: node.ssh_config.hostname = self.full_name(node.name) + node.ssh_config.set_username(self.username) + node.ssh_config.set_password(self.password) cmd = 'cat /var/emulab/boot/topomap' topomap = ssh.execute_command(self, experiment.nodes[0].ssh_config, cmd) |