diff options
author | Vincenzo Maffione <v.maffione@gmail.com> | 2017-04-07 19:40:12 +0200 |
---|---|---|
committer | Vincenzo Maffione <v.maffione@gmail.com> | 2017-04-07 19:40:12 +0200 |
commit | f1630941a0c47fdd025219340e5383cbaefcd85e (patch) | |
tree | 03da2fdb96d881e80905eb0557b24974c4e0e7fa /rumba/testbeds | |
parent | 2666310aa2a25e5d66b669bde337711e7d22c904 (diff) | |
download | rumba-f1630941a0c47fdd025219340e5383cbaefcd85e.tar.gz rumba-f1630941a0c47fdd025219340e5383cbaefcd85e.zip |
rumba: simplify cooperation between prototype and testbed plugins
Diffstat (limited to 'rumba/testbeds')
-rw-r--r-- | rumba/testbeds/emulab.py | 2 | ||||
-rw-r--r-- | rumba/testbeds/faketestbed.py | 2 | ||||
-rw-r--r-- | rumba/testbeds/jfed.py | 2 | ||||
-rw-r--r-- | rumba/testbeds/qemu.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py index 134d344..c4dbe36 100644 --- a/rumba/testbeds/emulab.py +++ b/rumba/testbeds/emulab.py @@ -235,7 +235,7 @@ class Testbed(mod.Testbed): ipcp.ifname = item[0] node.full_name = self.full_name(node.name) - def create_experiment(self, experiment): + def swap_in(self, experiment): self._create_experiment(experiment) self.swap_exp_in() self.wait_until_nodes_up() diff --git a/rumba/testbeds/faketestbed.py b/rumba/testbeds/faketestbed.py index 4821aa8..85110b8 100644 --- a/rumba/testbeds/faketestbed.py +++ b/rumba/testbeds/faketestbed.py @@ -25,5 +25,5 @@ class Testbed(mod.Testbed): def __init__(self, exp_name, username, proj_name="ARCFIRE", password=""): mod.Testbed.__init__(self, exp_name, username, password, proj_name) - def create_experiment(self, experiment): + def swap_in(self, experiment): print("[Fake testbed] experiment swapped in") diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index e606846..f56e5ba 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -106,7 +106,7 @@ class Testbed(mod.Testbed): file.write(doc.toprettyxml()) file.close() - def create_experiment(self, experiment): + def swap_in(self, experiment): self.create_rspec(experiment) for node in experiment.nodes: diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index 7dae921..49bfcc2 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -64,7 +64,7 @@ class Testbed(mod.Testbed): except CalledProcessError as e: error_queue.put(str(e)) - def create_experiment(self, experiment): + def swap_in(self, experiment): """ :type experiment mod.Experiment :param experiment: The experiment running @@ -227,7 +227,7 @@ class Testbed(mod.Testbed): vmid += 1 - def __del__(self): + def swap_out(self): """ :rtype str :return: The script to tear down the experiment |