aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincenzo Maffione <v.maffione@gmail.com>2017-02-07 16:12:57 +0100
committerVincenzo Maffione <v.maffione@gmail.com>2017-02-07 16:12:57 +0100
commitf0537f022eab056a3f5d6c6fea31274e5d2f06c8 (patch)
tree30fe43b4ba73d2f9a095ff5c36bfa2f6173c701d
parentbf4eaaa0704ee5f31474f3cbaeb90d0cc8084a53 (diff)
downloadrumba-f0537f022eab056a3f5d6c6fea31274e5d2f06c8.tar.gz
rumba-f0537f022eab056a3f5d6c6fea31274e5d2f06c8.zip
move faketestbed to its own file
-rwxr-xr-x[-rw-r--r--]example.py6
-rwxr-xr-xrhumba.py10
-rw-r--r--rhumba_faketestbed.py31
3 files changed, 37 insertions, 10 deletions
diff --git a/example.py b/example.py
index 2c24e09..b13f0ce 100644..100755
--- a/example.py
+++ b/example.py
@@ -3,8 +3,13 @@
# An example script using rhumba.py
from rhumba import *
+
+# import testbed plugins
import rhumba_emulab as emulab
import rhumba_jfed as jfed
+import rhumba_faketestbed as fake
+
+# import prototype plugins
import rhumba_ouroboros as our
import rhumba_rlite as rl
import rhumba_irati as irati
@@ -28,6 +33,7 @@ tb = jfed.jFedTestbed(exp_name = "letest",
username = "sander",
cert_file = "cert.pem",
jfed_jar = "jfed_cli/experimenter-cli.jar")
+#tb = fake.FakeTestbed(exp_name = "x", username = "yy")
exp = irati.IRATIExperiment(tb, nodes = [a, b])
diff --git a/rhumba.py b/rhumba.py
index 00f67ba..0346a8c 100755
--- a/rhumba.py
+++ b/rhumba.py
@@ -40,16 +40,6 @@ class Testbed:
raise Exception('create_experiment() not implemented')
-# Fake testbed, useful for testing
-class FakeTestbed:
- def __init__(self, exp_name, username, proj_name = "ARCFIRE",
- password = ""):
- Testbed.__init__(self, exp_name, username, password, proj_name)
-
- def create_experiment(self, nodes, links):
- print("[Fake testbed] experiment swapped in")
-
-
# Represents an interface on a node
#
# @name [string] interface name
diff --git a/rhumba_faketestbed.py b/rhumba_faketestbed.py
new file mode 100644
index 0000000..61e9070
--- /dev/null
+++ b/rhumba_faketestbed.py
@@ -0,0 +1,31 @@
+#
+# Fake testbed for Rhumba testing
+#
+# Vincenzo Maffione <v.maffione@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., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301 USA
+
+import rhumba
+
+# Fake testbed, useful for testing
+class FakeTestbed(rhumba.Testbed):
+ def __init__(self, exp_name, username, proj_name = "ARCFIRE",
+ password = ""):
+ rhumba.Testbed.__init__(self, exp_name, username, password, proj_name)
+
+ def create_experiment(self, nodes, links):
+ print("[Fake testbed] experiment swapped in")
+