diff options
| author | vmaffione <[email protected]> | 2017-02-13 13:30:24 +0000 |
|---|---|---|
| committer | vmaffione <[email protected]> | 2017-02-13 13:30:24 +0000 |
| commit | 78217ab203ca247ae8dea1cd673c3174953ef4ae (patch) | |
| tree | 8d646fdd2a7a7a3ccdb4087fb53bdce7bc508b64 | |
| parent | ddba01f87c57cf8096205783eaada858213b5410 (diff) | |
| parent | afe0fe627fd1609c284386a6b8a27279d8d0a42f (diff) | |
| download | rumba-78217ab203ca247ae8dea1cd673c3174953ef4ae.tar.gz rumba-78217ab203ca247ae8dea1cd673c3174953ef4ae.zip | |
Merge branch 'master-emulab' into 'master'
emulab: Fix complete experiment graph
See merge request !8
| -rw-r--r-- | rumba/testbeds/emulab.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py index 735bf3a..b7c0c51 100644 --- a/rumba/testbeds/emulab.py +++ b/rumba/testbeds/emulab.py @@ -200,7 +200,7 @@ class EmulabTestbed(Testbed): @param links: holds the links in the experiment ''' - node_full_name = full_name(self, nodes[0].name) + node_full_name = self.full_name(nodes[0].name) cmd = 'cat /var/emulab/boot/topomap' topomap = ssh.execute_command(self, node_full_name, cmd) # Almost as ugly as yo momma @@ -223,7 +223,7 @@ class EmulabTestbed(Testbed): for node in nodes: cmd = 'cat /var/emulab/boot/ifmap' - node_full_name = full_name(self, node.name) + node_full_name = self.full_name(node.name) output = ssh.execute_command(self, node_full_name, cmd) output = re.split('\\\\n', output) for item in output: @@ -241,4 +241,4 @@ class EmulabTestbed(Testbed): self._create_experiment(nodes, links) self.swap_exp_in() self.wait_until_nodes_up() - es.complete_experiment_graph(nodes, links) + self.complete_experiment_graph(nodes, links) |