rumba: Rename package to rumba

This renames the package to rumba, since rhumba was already taken on
the PyPi.

13 files changed, 50 insertions, 46 deletions

diff --git a/examples/example.py b/examples/example.py
index ad4116e..4430fb5 100755
--- a/examples/example.py
+++ b/examples/example.py
@@ -1,18 +1,18 @@
 #!/usr/bin/env python
 
-# An example script using rhumba.py
+# An example script using the rumba package
 
-from rhumba.model import *
+from rumba.model import *
 
 # import testbed plugins
-import rhumba.testbeds.emulab as emulab
-import rhumba.testbeds.jfed as jfed
-import rhumba.testbeds.faketestbed as fake
+import rumba.testbeds.emulab as emulab
+import rumba.testbeds.jfed as jfed
+import rumba.testbeds.faketestbed as fake
 
 # import prototype plugins
-import rhumba.prototypes.ouroboros as our
-import rhumba.prototypes.rlite as rl
-import rhumba.prototypes.irati as irati
+import rumba.prototypes.ouroboros as our
+import rumba.prototypes.rlite as rl
+import rumba.prototypes.irati as irati
 
 n1 = NormalDIF("n1", policies = {"rmt.pff": "lfa",
                                  "security-manager": "passwd"})
@@ -29,11 +29,11 @@ b = Node("b",
          difs = [e1, n1],
          dif_registrations = {n1 : [e1]})
 
-#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")
+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/__init__.py b/rumba/__init__.py
index e69de29..e69de29 100644
--- a/rhumba/__init__.py
+++ b/rumba/__init__.py
diff --git a/rhumba/model.py b/rumba/model.py
index 0346a8c..0346a8c 100644
--- a/rhumba/model.py
+++ b/rumba/model.py
diff --git a/rhumba/prototypes/__init__.py b/rumba/prototypes/__init__.py
index e69de29..e69de29 100644
--- a/rhumba/prototypes/__init__.py
+++ b/rumba/prototypes/__init__.py
diff --git a/rhumba/prototypes/irati.py b/rumba/prototypes/irati.py
index beb266f..af98f2e 100644
--- a/rhumba/prototypes/irati.py
+++ b/rumba/prototypes/irati.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
-import rhumba.ssh_support as ssh
-from rhumba.model import Experiment
+import rumba.ssh_support as ssh
+from rumba.model import Experiment
 
 # An experiment over the IRATI implementation
 class IRATIExperiment(Experiment):
diff --git a/rhumba/prototypes/ouroboros.py b/rumba/prototypes/ouroboros.py
index eb1f824..0f60ee8 100644
--- a/rhumba/prototypes/ouroboros.py
+++ b/rumba/prototypes/ouroboros.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
-import rhumba.ssh_support as ssh
-from rhumba.model import Experiment
+import rumba.ssh_support as ssh
+from rumba.model import Experiment
 
 # An experiment over the Ouroboros implementation
 class OuroborosExperiment(Experiment):
diff --git a/rhumba/prototypes/rlite.py b/rumba/prototypes/rlite.py
index e68377c..9148bfa 100644
--- a/rhumba/prototypes/rlite.py
+++ b/rumba/prototypes/rlite.py
@@ -18,8 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
-import rhumba.ssh_support as ssh
-from rhumba.model import Experiment
+import rumba.ssh_support as ssh
+from rumba.model import Experiment
 
 # An experiment over the RLITE implementation
 class RLITEExperiment(Experiment):
diff --git a/rhumba/ssh_support.py b/rumba/ssh_support.py
index 6bc892f..552c43f 100644
--- a/rhumba/ssh_support.py
+++ b/rumba/ssh_support.py
@@ -1,5 +1,5 @@
 #
-# SSH support for Rhumba
+# SSH support for Rumba
 #
 #    Sander Vrijders  <sander.vrijders@intec.ugent.be>
 #
diff --git a/rhumba/testbeds/__init__.py b/rumba/testbeds/__init__.py
index e69de29..e69de29 100644
--- a/rhumba/testbeds/__init__.py
+++ b/rumba/testbeds/__init__.py
diff --git a/rhumba/testbeds/emulab.py b/rumba/testbeds/emulab.py
index ec8e6d9..735bf3a 100644
--- a/rhumba/testbeds/emulab.py
+++ b/rumba/testbeds/emulab.py
@@ -1,5 +1,5 @@
 #
-# Emulab support for Rhumba
+# Emulab support for Rumba
 #
 #    Sander Vrijders  <sander.vrijders@intec.ugent.be>
 #    Wouter Tavernier <wouter.tavernier@intec.ugent.be>
@@ -24,8 +24,8 @@ import time
 import re
 from ast import literal_eval
 
-import rhumba.ssh_support as ssh
-from rhumba.model import Testbed
+import rumba.ssh_support as ssh
+from rumba.model import Testbed
 
 import warnings
 warnings.filterwarnings("ignore")
@@ -147,7 +147,7 @@ class EmulabTestbed(Testbed):
         @return: ns2 script for Emulab experiment
         '''
 
-        ns2_script = "# ns script generated by Rhumba\n"
+        ns2_script = "# ns script generated by Rumba\n"
         ns2_script += "set ns [new Simulator]\n"
         ns2_script += "source tb_compat.tcl\n"
 
diff --git a/rhumba/testbeds/faketestbed.py b/rumba/testbeds/faketestbed.py
index 14ce2b3..f163411 100644
--- a/rhumba/testbeds/faketestbed.py
+++ b/rumba/testbeds/faketestbed.py
@@ -1,5 +1,5 @@
 #
-# Fake testbed for Rhumba testing
+# Fake testbed for Rumba testing
 #
 #    Vincenzo Maffione  <v.maffione@nextworks.it>
 #
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301  USA
 
-from rhumba.model import Testbed
+from rumba.model import Testbed
 
 # Fake testbed, useful for testing
 class FakeTestbed(Testbed):
diff --git a/rhumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index 7a504cd..5f4d496 100644
--- a/rhumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -1,5 +1,5 @@
 #
-# jFed support for Rhumba
+# jFed support for Rumba
 #
 #    Sander Vrijders  <sander.vrijders@intec.ugent.be>
 #
@@ -22,7 +22,7 @@ import subprocess
 import getpass
 import xml.dom.minidom as xml
 
-from rhumba.model import Testbed
+from rumba.model import Testbed
 
 class jFedTestbed(Testbed):
     def __init__(self, exp_name, username, cert_file, jfed_jar, exp_hours = "2",
@@ -44,19 +44,20 @@ class jFedTestbed(Testbed):
         top_el = doc.documentElement
         top_el.setAttribute("xmlns", "http://www.geni.net/resources/rspec/3")
         top_el.setAttribute("type", "request")
-        top_el.setAttribute("xmlns:emulab", "http://www.protogeni.net/resources/" +
-                            "rspec/ext/emulab/1")
-        top_el.setAttribute("xmlns:jfedBonfire", "http://jfed.iminds.be/rspec/" +
-                            "ext/jfed-bonfire/1")
-        top_el.setAttribute("xmlns:delay", "http://www.protogeni.net/resources/" +
-                            "rspec/ext/delay/1")
+        top_el.setAttribute("xmlns:emulab", "http://www.protogeni.net/" +
+                            "resources/rspec/ext/emulab/1")
+        top_el.setAttribute("xmlns:jfedBonfire", "http://jfed.iminds.be/" +
+                            "rspec/ext/jfed-bonfire/1")
+        top_el.setAttribute("xmlns:delay", "http://www.protogeni.net/" +
+                            "resources/rspec/ext/delay/1")
         top_el.setAttribute("xmlns:jfed-command", "http://jfed.iminds.be/" +
                             "rspec/ext/jfed-command/1")
-        top_el.setAttribute("xmlns:client", "http://www.protogeni.net/resources/" +
-                            "rspec/ext/client/1")
-        top_el.setAttribute("xmlns:jfed-ssh-keys", "http://jfed.iminds.be/rspec" +
-                            "/ext/jfed-ssh-keys/1")
-        top_el.setAttribute("xmlns:jfed", "http://jfed.iminds.be/rspec/ext/jfed/1")
+        top_el.setAttribute("xmlns:client", "http://www.protogeni.net/" +
+                            "resources/rspec/ext/client/1")
+        top_el.setAttribute("xmlns:jfed-ssh-keys", "http://jfed.iminds.be/" +
+                            "rspec/ext/jfed-ssh-keys/1")
+        top_el.setAttribute("xmlns:jfed", "http://jfed.iminds.be/rspec/" +
+                            "ext/jfed/1")
         top_el.setAttribute("xmlns:sharedvlan", "http://www.protogeni.net/" +
                             "resources/rspec/ext/shared-vlan/1")
         top_el.setAttribute("xmlns:xsi", "http://www.w3.org/2001/" +
@@ -81,9 +82,11 @@ class jFedTestbed(Testbed):
                 if link.node_a == node or link.node_b == node:
                     el3 = doc.createElement("interface")
                     if link.node_a == node:
-                        link_id = link.int_a.id = node.name + ":if" + str(node.ifs)
+                        link.int_a.id = node.name + ":if" + str(node.ifs)
+                        link_id = link.int_a.id
                     if link.node_b == node:
-                        link_id = link.int_b.id = node.name + ":if" + str(node.ifs)
+                        link.int_b.id = node.name + ":if" + str(node.ifs)
+                        link_id = link.int_b.id
 
                     el3.setAttribute("client_id", link_id)
                     node.ifs += 1
@@ -124,7 +127,8 @@ class jFedTestbed(Testbed):
                          self.proj_name, "--rspec", \
                          self.rspec, "-s", \
                          self.exp_name, "-p", self.cert_file, "-k", \
-                         "usercert,userkeys,shareduserallkeys", "--create-slice",\
+                         "usercert,userkeys,shareduserallkeys", \
+                         "--create-slice",\
                          "--manifest", self.manifest,
                          "-P", self.password, \
                          "-e", self.exp_hours])
diff --git a/setup.py b/setup.py
index d09f64f..4b8afae 100644
--- a/setup.py
+++ b/setup.py
@@ -8,15 +8,15 @@ with open(path.join(here, 'README'), encoding='utf-8') as f:
     long_description = f.read()
 
 setup(
-    name = "Rhumba",
+    name = "Rumba",
     version = "0.1",
-    url = "https://gitlab.com/arcfire/rhumba",
+    url = "https://gitlab.com/arcfire/rumba",
     keywords = "rina measurement testbed",
     author = "Sander Vrijders",
     author_email = "sander.vrijders@intec.ugent.be",
     license = "LGPL",
-    description = "Rhumba measurement framework for RINA",
+    description = "Rumba measurement framework for RINA",
     long_description = long_description,
-    packages = ["rhumba", "rhumba.testbeds", "rhumba.prototypes"],
+    packages = ["rumba", "rumba.testbeds", "rumba.prototypes"],
     install_requires = ["paramiko", "wheel"]
 )