Merge branch 'master-vincenzo' into 'master'

Master vincenzo

See merge request !6

1 files changed, 0 insertions, 48 deletions

diff --git a/rhumba.py b/rhumba.py
index 1ffd092..0346a8c 100755
--- a/rhumba.py
+++ b/rhumba.py
@@ -19,10 +19,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
-import emulab_support as es
-import jfed_support as js
 import abc
-import getpass
 
 # Represents generic testbed info
 #
@@ -43,51 +40,6 @@ class Testbed:
         raise Exception('create_experiment() not implemented')
 
 
-# Represents an emulab testbed info
-#
-# @url [string] URL of the testbed
-# @image [string] specific image to use
-#
-class EmulabTestbed:
-    def __init__(self, exp_name, username, password = "",
-                 proj_name  = "ARCFIRE", url = "wall1.ilabt.iminds.be",
-                 image = "UBUNTU14-64-STD"):
-        Testbed.__init__(self, exp_name, username, password, proj_name)
-        self.url = url
-        self.image = image
-
-    def create_experiment(self, nodes, links):
-        es.create_experiment(self, nodes, links)
-        es.swap_exp_in(self)
-        es.wait_until_nodes_up(self)
-        es.complete_experiment_graph(self, nodes, links)
-
-
-class jFedTestbed:
-    def __init__(self, exp_name, username, cert_file, jfed_jar, exp_hours = "2",
-                 proj_name = "ARCFIRE", authority = "wall2.ilabt.iminds.be"):
-        passwd = getpass.getpass(prompt = "Password for certificate file: ")
-        Testbed.__init__(self, exp_name, username, passwd, proj_name)
-        self.authority = "urn:publicid:IDN+" + authority + "+authority+cm"
-        self.auth_name = authority
-        self.cert_file = cert_file
-        self.jfed_jar = jfed_jar
-        self.exp_hours = exp_hours
-
-    def create_experiment(self, nodes, links):
-        js.create_experiment(self, nodes, links)
-
-
-# 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