diff options
| author | Marco Capitani <m.capitani@nextworks.it> | 2017-04-14 09:49:48 +0200 |
|---|---|---|
| committer | Marco Capitani <m.capitani@nextworks.it> | 2017-04-14 09:50:49 +0200 |
| commit | 6fb1eba8509fd0f9bb9cb6f2d4072e1cd879fe04 (patch) | |
| tree | 2213c7bf40ad52084a6fb8a851cf9cac25cc7bf8 /rumba/testbeds | |
| parent | 1ccea182dbde7cc2b875f8a5e5434b0f7ba822cd (diff) | |
| parent | 4ec36e8f6b1cb4911458c80d8789b1452422e8c2 (diff) | |
| download | rumba-6fb1eba8509fd0f9bb9cb6f2d4072e1cd879fe04.tar.gz rumba-6fb1eba8509fd0f9bb9cb6f2d4072e1cd879fe04.zip | |
Realign with master (MR 29-30)
Diffstat (limited to 'rumba/testbeds')
| -rw-r--r-- | rumba/testbeds/emulab.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py index aee438e..c031327 100644 --- a/rumba/testbeds/emulab.py +++ b/rumba/testbeds/emulab.py @@ -125,7 +125,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_server(), ns, dest_file_name) + ssh.copy_file_to_testbed(self, self.ops_ssh_config, ns, dest_file_name) cmd = '/usr/testbed/bin/sslxmlrpc_client.py startexp ' + \ 'batch=false wait=true proj="' + proj_name + \ @@ -203,7 +203,7 @@ class Testbed(mod.Testbed): ''' for node in experiment.nodes: - node.ssh_config.hostname = self.full_name(experiment.nodes[0].name) + node.ssh_config.hostname = self.full_name(node.name) cmd = 'cat /var/emulab/boot/topomap' topomap = ssh.execute_command(self, experiment.nodes[0].ssh_config, cmd) |