diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-05-08 17:07:17 +0200 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-05-08 17:07:17 +0200 |
| commit | b786439780f04a3331f9c2d069427e1c111e7005 (patch) | |
| tree | 493df0f5e5241a4e1f8a613a5def595f2e74c933 /rumba/prototypes | |
| parent | d75418c2884e704cad16f4a354de973cb9208cc8 (diff) | |
| parent | e7e81f30d8a6054e142cf7c77459532247a644d2 (diff) | |
| download | rumba-b786439780f04a3331f9c2d069427e1c111e7005.tar.gz rumba-b786439780f04a3331f9c2d069427e1c111e7005.zip | |
Merge branch 'master' into testing
Diffstat (limited to 'rumba/prototypes')
| -rw-r--r-- | rumba/prototypes/irati.py | 7 | ||||
| -rw-r--r-- | rumba/prototypes/ouroboros.py | 9 | ||||
| -rw-r--r-- | rumba/prototypes/rlite.py | 6 |
3 files changed, 16 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..016183e 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -44,7 +44,8 @@ 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', + dt_strategy='full-mesh'): """ Initializes the experiment class. @@ -52,8 +53,12 @@ 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'. + :param dt_strategy: For data flows, '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, + dt_strategy=dt_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): |