diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-13 15:00:07 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2017-02-13 15:00:07 +0100 |
| commit | 59ddcc618e901d14c47a8c1f97bb8589f6a4d5e0 (patch) | |
| tree | 2f03681bc8a655c2a05f2ed1a52accc1b788d1d4 /rumba/prototypes | |
| parent | 78217ab203ca247ae8dea1cd673c3174953ef4ae (diff) | |
| download | rumba-59ddcc618e901d14c47a8c1f97bb8589f6a4d5e0.tar.gz rumba-59ddcc618e901d14c47a8c1f97bb8589f6a4d5e0.zip | |
testbeds, prototypes: Omit dir name from class name
The directory name was always prepended to the class name, but since
they are in distinct namespaces this could be easily removed.
Diffstat (limited to 'rumba/prototypes')
| -rw-r--r-- | rumba/prototypes/irati.py | 9 | ||||
| -rw-r--r-- | rumba/prototypes/ouroboros.py | 6 | ||||
| -rw-r--r-- | rumba/prototypes/rlite.py | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index af98f2e..28f8ab3 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -19,12 +19,12 @@ # MA 02110-1301 USA import rumba.ssh_support as ssh -from rumba.model import Experiment +import rumba.model as mod # An experiment over the IRATI implementation -class IRATIExperiment(Experiment): +class Experiment(mod.Experiment): def __init__(self, testbed, nodes = list()): - Experiment.__init__(self, testbed, nodes) + mod.Experiment.__init__(self, testbed, nodes) def setup(self): cmds = list() @@ -38,7 +38,8 @@ class IRATIExperiment(Experiment): cmds.append("sudo nohup ipcm &> ipcm.log &") for node in self.nodes: - ssh.execute_commands(self.testbed, node.full_name, cmds, time_out = None) + ssh.execute_commands(self.testbed, node.full_name, + cmds, time_out = None) def run(self): print("[IRATI experiment] start") diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index 0f60ee8..172d69a 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -19,12 +19,12 @@ # MA 02110-1301 USA import rumba.ssh_support as ssh -from rumba.model import Experiment +import rumba.model as mod # An experiment over the Ouroboros implementation -class OuroborosExperiment(Experiment): +class Experiment(mod.Experiment): def __init__(self, testbed, nodes = list()): - Experiment.__init__(self, testbed, nodes) + mod.Experiment.__init__(self, testbed, nodes) def setup_ouroboros(self): cmds = list() diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py index 9148bfa..adb0036 100644 --- a/rumba/prototypes/rlite.py +++ b/rumba/prototypes/rlite.py @@ -19,12 +19,12 @@ # MA 02110-1301 USA import rumba.ssh_support as ssh -from rumba.model import Experiment +import rumba.model as mod # An experiment over the RLITE implementation -class RLITEExperiment(Experiment): +class Experiment(mod.Experiment): def __init__(self, testbed, nodes = list()): - Experiment.__init__(self, testbed, nodes) + mod.Experiment.__init__(self, testbed, nodes) def setup(self): cmds = list() @@ -39,7 +39,8 @@ class RLITEExperiment(Experiment): cmds.append("sudo nohup rlite-uipcps -v DBG -k 0 -U -A &> uipcp.log &") for node in self.nodes: - ssh.execute_commands(self.testbed, node.full_name, cmds, time_out = None) + ssh.execute_commands(self.testbed, node.full_name, + cmds, time_out = None) def run(self): print("[RLITE experiment] start") |