diff options
| author | Vincenzo Maffione <v.maffione@gmail.com> | 2018-05-08 11:03:05 +0200 |
|---|---|---|
| committer | Vincenzo Maffione <v.maffione@gmail.com> | 2018-05-08 11:04:09 +0200 |
| commit | 2e8cd8b8754384bef611efaadb18e1a977c5b30e (patch) | |
| tree | 897ca8e5540b4eea18ab197b24281bb3db6a68de /rumba/prototypes | |
| parent | f6bf94ed0502a5812aaf72cfe8af0ef3471dadc7 (diff) | |
| download | rumba-2e8cd8b8754384bef611efaadb18e1a977c5b30e.tar.gz rumba-2e8cd8b8754384bef611efaadb18e1a977c5b30e.zip | |
elements: Experiment: add missing enrollment_strategy argument
This is necessary to enable scripts to use full-mesh or manual
enrollment strategies.
Fixes #54.
Diffstat (limited to 'rumba/prototypes')
| -rw-r--r-- | rumba/prototypes/irati.py | 7 | ||||
| -rw-r--r-- | rumba/prototypes/ouroboros.py | 6 | ||||
| -rw-r--r-- | rumba/prototypes/rlite.py | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 1967278..ec3e53d 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -67,7 +67,8 @@ class Experiment(mod.Experiment): git_branch='arcfire', installpath=None, varpath=None, - app_mappings=None): + app_mappings=None, + enrollment_strategy='minimal'): """ Initializes the experiment class. @@ -81,13 +82,15 @@ class Experiment(mod.Experiment): all application which will register to any given dif. :type app_mappings: `List[(str, str)]` + :param enrollment_strategy: Can be 'full-mesh', 'minimal' or 'manual'. """ mod.Experiment.__init__(self, testbed, nodes, git_repo, git_branch, - prototype_logs=['/tmp/ipcmstart.log']) + prototype_logs=['/tmp/ipcmstart.log'], + enrollment_strategy=enrollment_strategy) if installpath is None: installpath = '/usr' if varpath is None: diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index e72bcf1..f415160 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -44,7 +44,7 @@ class Experiment(mod.Experiment): """ def __init__(self, testbed, nodes=None, git_repo='git://ouroboros.ilabt.imec.be/ouroboros', - git_branch='master'): + git_branch='master', enrollment_strategy='minimal'): """ Initializes the experiment class. @@ -52,8 +52,10 @@ class Experiment(mod.Experiment): :param nodes: The list of nodes. :param git_repo: The git repository to use for installation. :param git_branch: The branch of the git repository to use. + :param enrollment_strategy: Can be 'full-mesh', 'minimal' or 'manual'. """ - mod.Experiment.__init__(self, testbed, nodes, git_repo, git_branch) + mod.Experiment.__init__(self, testbed, nodes, git_repo, git_branch, + enrollment_strategy=enrollment_strategy) self.r_ipcps = dict() self.set_startup_command("irmd") diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py index 32b7df7..1595336 100644 --- a/rumba/prototypes/rlite.py +++ b/rumba/prototypes/rlite.py @@ -42,7 +42,7 @@ class Experiment(mod.Experiment): def __init__(self, testbed, nodes=None, git_repo='https://github.com/vmaffione/rlite', - git_branch='master'): + git_branch='master', enrollment_strategy='minimal'): """ Initializes the experiment class. @@ -50,9 +50,11 @@ class Experiment(mod.Experiment): :param nodes: The list of nodes. :param git_repo: The git repository to use for installation. :param git_branch: The branch of the git repository to use. + :param enrollment_strategy: Can be 'full-mesh', 'minimal' or 'manual'. """ mod.Experiment.__init__(self, testbed, nodes, git_repo, git_branch, - prototype_logs=['/tmp/uipcp.log']) + prototype_logs=['/tmp/uipcp.log'], + enrollment_strategy=enrollment_strategy) @staticmethod def make_executor(node, packages, testbed): |