diff options
29 files changed, 108 insertions, 65 deletions
diff --git a/doc/conf.py b/doc/conf.py index 1a73e44..daeb302 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -5,7 +5,7 @@ extensions = ['sphinx.ext.viewcode'] project = 'Rumba' year = datetime.now().year -copyright = '{} imec, Nextworks S.r.l.'.format(year) +copyright = '2017-2018 imec, Nextworks S.r.l.' author = 'Sander Vrijders, Marco Capitani, Dimitri Staessens, Vincenzo Maffione' master_doc = 'index' source_suffix = '.rst' diff --git a/rumba/__init__.py b/rumba/__init__.py index 6f6b5b2..62897b3 100644 --- a/rumba/__init__.py +++ b/rumba/__init__.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/_version.py b/rumba/_version.py index b5540a0..8a1900b 100644 --- a/rumba/_version.py +++ b/rumba/_version.py @@ -1,2 +1,28 @@ +# +# A library to manage ARCFIRE experiments +# +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec +# +# Sander Vrijders <sander.vrijders@ugent.be> +# Dimitri Staessens <dimitri.staessens@ugent.be> +# Vincenzo Maffione <v.maffione@nextworks.it> +# Marco Capitani <m.capitani@nextworks.it> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., http://www.fsf.org/about/contact/. +# + __version_info__ = (0, 8) __version__ = '.'.join(map(str, __version_info__)) diff --git a/rumba/elements/__init__.py b/rumba/elements/__init__.py index e69de29..62897b3 100644 --- a/rumba/elements/__init__.py +++ b/rumba/elements/__init__.py @@ -0,0 +1,25 @@ +# +# A library to manage ARCFIRE experiments +# +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec +# +# Sander Vrijders <sander.vrijders@ugent.be> +# Dimitri Staessens <dimitri.staessens@ugent.be> +# Vincenzo Maffione <v.maffione@nextworks.it> +# Marco Capitani <m.capitani@nextworks.it> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., http://www.fsf.org/about/contact/. +# diff --git a/rumba/elements/experimentation.py b/rumba/elements/experimentation.py index 2626a0a..e8e3c27 100644 --- a/rumba/elements/experimentation.py +++ b/rumba/elements/experimentation.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,7 +24,6 @@ # Foundation, Inc., http://www.fsf.org/about/contact/. # - import abc import os import shutil diff --git a/rumba/elements/topology.py b/rumba/elements/topology.py index 87aeb4c..2efbdff 100644 --- a/rumba/elements/topology.py +++ b/rumba/elements/topology.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,7 +24,6 @@ # Foundation, Inc., http://www.fsf.org/about/contact/. # - from enum import Enum import rumba.log as log diff --git a/rumba/executors/__init__.py b/rumba/executors/__init__.py index 58fcfb5..62897b3 100644 --- a/rumba/executors/__init__.py +++ b/rumba/executors/__init__.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/rumba/executors/docker.py b/rumba/executors/docker.py index e1e1480..e3d40dc 100644 --- a/rumba/executors/docker.py +++ b/rumba/executors/docker.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/rumba/executors/local.py b/rumba/executors/local.py index 9f3f484..455b05c 100644 --- a/rumba/executors/local.py +++ b/rumba/executors/local.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/rumba/executors/ssh.py b/rumba/executors/ssh.py index 6a3a41d..c47358f 100644 --- a/rumba/executors/ssh.py +++ b/rumba/executors/ssh.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -61,4 +60,4 @@ class SSHExecutor(Executor): destination, sudo) def copy_file(self, node, path, destination): - copy_file_to_testbed(self.testbed, node.ssh_config, path, destination)
\ No newline at end of file + copy_file_to_testbed(self.testbed, node.ssh_config, path, destination) diff --git a/rumba/log.py b/rumba/log.py index 2ee871c..17ad22e 100644 --- a/rumba/log.py +++ b/rumba/log.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/model.py b/rumba/model.py index 2d573f6..7306138 100644 --- a/rumba/model.py +++ b/rumba/model.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -25,7 +24,6 @@ # Foundation, Inc., http://www.fsf.org/about/contact/. # - import os import stat diff --git a/rumba/multiprocess.py b/rumba/multiprocess.py index d7ca18d..508c9d9 100644 --- a/rumba/multiprocess.py +++ b/rumba/multiprocess.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/prototypes/__init__.py b/rumba/prototypes/__init__.py index 6f6b5b2..62897b3 100644 --- a/rumba/prototypes/__init__.py +++ b/rumba/prototypes/__init__.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/prototypes/enroll.py b/rumba/prototypes/enroll.py index 27b5ebe..d3501cc 100755 --- a/rumba/prototypes/enroll.py +++ b/rumba/prototypes/enroll.py @@ -2,8 +2,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/prototypes/irati.py b/rumba/prototypes/irati.py index 2914662..1967278 100644 --- a/rumba/prototypes/irati.py +++ b/rumba/prototypes/irati.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/prototypes/irati_templates.py b/rumba/prototypes/irati_templates.py index d5beea5..6e5932d 100644 --- a/rumba/prototypes/irati_templates.py +++ b/rumba/prototypes/irati_templates.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py index b2628cf..573e336 100644 --- a/rumba/prototypes/ouroboros.py +++ b/rumba/prototypes/ouroboros.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/prototypes/rlite.py b/rumba/prototypes/rlite.py index 7d0bb57..32b7df7 100644 --- a/rumba/prototypes/rlite.py +++ b/rumba/prototypes/rlite.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/recpoisson.py b/rumba/recpoisson.py index 67dfab6..a4cf492 100644 --- a/rumba/recpoisson.py +++ b/rumba/recpoisson.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index a9dff28..7623f6d 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/storyboard.py b/rumba/storyboard.py index de2bc62..799c78e 100644 --- a/rumba/storyboard.py +++ b/rumba/storyboard.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/testbeds/__init__.py b/rumba/testbeds/__init__.py index 6f6b5b2..62897b3 100644 --- a/rumba/testbeds/__init__.py +++ b/rumba/testbeds/__init__.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/testbeds/dockertb.py b/rumba/testbeds/dockertb.py index 6d7c7b5..dca2b86 100644 --- a/rumba/testbeds/dockertb.py +++ b/rumba/testbeds/dockertb.py @@ -1,14 +1,13 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> # Vincenzo Maffione <v.maffione@nextworks.it> # Marco Capitani <m.capitani@nextworks.it> -# Nick Aerts <nick.aerts@ugent.be> # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -24,6 +23,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., http://www.fsf.org/about/contact/. # + import os from time import sleep import docker diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py index 1ede96d..f0c0350 100644 --- a/rumba/testbeds/emulab.py +++ b/rumba/testbeds/emulab.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py index da1cf2d..a651b63 100644 --- a/rumba/testbeds/jfed.py +++ b/rumba/testbeds/jfed.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/testbeds/local.py b/rumba/testbeds/local.py index 8e382f8..a3f4570 100644 --- a/rumba/testbeds/local.py +++ b/rumba/testbeds/local.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index fab1726..a09229b 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> @@ -23,6 +23,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., http://www.fsf.org/about/contact/. # + import multiprocessing as old_m import os import subprocess diff --git a/rumba/utils.py b/rumba/utils.py index fd12333..88ea0d3 100644 --- a/rumba/utils.py +++ b/rumba/utils.py @@ -1,8 +1,8 @@ # # A library to manage ARCFIRE experiments # -# Copyright (C) 2017 Nextworks S.r.l. -# Copyright (C) 2017 imec +# Copyright (C) 2017-2018 Nextworks S.r.l. +# Copyright (C) 2017-2018 imec # # Sander Vrijders <sander.vrijders@ugent.be> # Dimitri Staessens <dimitri.staessens@ugent.be> @@ -23,6 +23,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., http://www.fsf.org/about/contact/. # + import enum import os |