Fix pylint warnings and errors

This fixes several warnings and errors as reported by pylint.

4 files changed, 27 insertions, 30 deletions

diff --git a/rumba/testbeds/emulab.py b/rumba/testbeds/emulab.py
index 971202b..134d344 100644
--- a/rumba/testbeds/emulab.py
+++ b/rumba/testbeds/emulab.py
@@ -23,11 +23,11 @@ import os
 import time
 import re
 from ast import literal_eval
+import warnings
 
 import rumba.ssh_support as ssh
 import rumba.model as mod
 
-import warnings
 warnings.filterwarnings("ignore")
 
 # Represents an emulab testbed info
@@ -36,9 +36,9 @@ warnings.filterwarnings("ignore")
 # @image [string] specific image to use
 #
 class Testbed(mod.Testbed):
-    def __init__(self, exp_name, username, password = "",
-                 proj_name  = "ARCFIRE", url = "wall2.ilabt.iminds.be",
-                 image = "UBUNTU14-64-STD"):
+    def __init__(self, exp_name, username, password="",
+                 proj_name="ARCFIRE", url="wall2.ilabt.iminds.be",
+                 image="UBUNTU14-64-STD"):
         mod.Testbed.__init__(self, exp_name, username, password, proj_name)
         self.url = url
         self.image = image
@@ -66,7 +66,7 @@ class Testbed(mod.Testbed):
         return node_name + '.' + self.exp_name + '.' + \
             self.proj_name + '.' + self.url
 
-    def get_experiment_list(self, project_name = None):
+    def get_experiment_list(self, project_name=None):
         '''
         Get list of made emulab experiments accessible with your credentials
 
@@ -80,11 +80,11 @@ class Testbed(mod.Testbed):
 
         try:
             if project_name != None:
-                return  literal_eval(out)[project_name][project_name]
+                return literal_eval(out)[project_name][project_name]
             else:
-                return  literal_eval(out)
+                return literal_eval(out)
         except:
-            return { project_name: { project_name: [] }}
+            return {project_name: {project_name: []}}
 
     def swap_exp_in(self):
         '''
@@ -131,8 +131,8 @@ class Testbed(mod.Testbed):
               '" exp="' + exp_name + '" noswapin=true ' + \
               'nsfilepath="' + dest_file_name + '"'
 
-        ssh.execute_command(self, self.ops_server(), cmd, time_out = None)
-        ssh.execute_command(self, self.ops_server(),'rm ' + dest_file_name)
+        ssh.execute_command(self, self.ops_server(), cmd, time_out=None)
+        ssh.execute_command(self, self.ops_server(), 'rm ' + dest_file_name)
         print("New experiment succesfully created.")
 
     def generate_ns_script(self, experiment):
@@ -151,12 +151,12 @@ class Testbed(mod.Testbed):
         ns2_script += "source tb_compat.tcl\n"
 
         for node in experiment.nodes:
-                ns2_script += "set " + node.name + " [$ns node]\n"
-                ns2_script += "tb-set-node-os $" + node.name + " " + \
-                              self.image + "\n"
+            ns2_script += "set " + node.name + " [$ns node]\n"
+            ns2_script += "tb-set-node-os $" + node.name + " " + \
+                          self.image + "\n"
 
         for dif in experiment.dif_ordering:
-            if type(dif) is mod.ShimEthDIF:
+            if isinstance(dif, mod.ShimEthDIF):
                 if len(dif.ipcps) != 2:
                     continue
                 ns2_script += "set " + dif.name + \
@@ -220,17 +220,17 @@ class Testbed(mod.Testbed):
                         continue
                     for ipcp in node.ipcps:
                         if ipcp.dif.name == link_name:
-                                self.ip[ipcp] = link_ip
+                            self.ip[ipcp] = link_ip
 
         for node in experiment.nodes:
             cmd = 'cat /var/emulab/boot/ifmap'
-            node_full_name  = self.full_name(node.name)
+            node_full_name = self.full_name(node.name)
             output = ssh.execute_command(self, node_full_name, cmd)
             output = re.split('\\\\n', output)
             for item in output:
                 item = item.split()
                 for ipcp in node.ipcps:
-                    if type(ipcp) is mod.ShimEthIPCP:
+                    if isinstance(ipcp, mod.ShimEthIPCP):
                         if self.ip[ipcp] == item[1]:
                             ipcp.ifname = item[0]
             node.full_name = self.full_name(node.name)
diff --git a/rumba/testbeds/faketestbed.py b/rumba/testbeds/faketestbed.py
index 8d5e724..4821aa8 100644
--- a/rumba/testbeds/faketestbed.py
+++ b/rumba/testbeds/faketestbed.py
@@ -22,8 +22,7 @@ import rumba.model as mod
 
 # Fake testbed, useful for testing
 class Testbed(mod.Testbed):
-    def __init__(self, exp_name, username, proj_name = "ARCFIRE",
-                 password = ""):
+    def __init__(self, exp_name, username, proj_name="ARCFIRE", password=""):
         mod.Testbed.__init__(self, exp_name, username, password, proj_name)
 
     def create_experiment(self, experiment):
diff --git a/rumba/testbeds/jfed.py b/rumba/testbeds/jfed.py
index 4a36d4a..e606846 100644
--- a/rumba/testbeds/jfed.py
+++ b/rumba/testbeds/jfed.py
@@ -25,9 +25,9 @@ import xml.dom.minidom as xml
 import rumba.model as mod
 
 class Testbed(mod.Testbed):
-    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: ")
+    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: ")
         mod.Testbed.__init__(self, exp_name, username, passwd, proj_name)
         self.authority = "urn:publicid:IDN+" + authority + "+authority+cm"
         self.auth_name = authority
@@ -35,10 +35,10 @@ class Testbed(mod.Testbed):
         self.jfed_jar = jfed_jar
         self.exp_hours = exp_hours
         self.if_id = dict()
-
-    def create_rspec(self, experiment):
         self.rspec = self.exp_name + ".rspec"
+        self.manifest = self.exp_name + ".rrspec"
 
+    def create_rspec(self, experiment):
         impl = xml.getDOMImplementation()
         doc = impl.createDocument(None, "rspec", None)
 
@@ -80,7 +80,7 @@ class Testbed(mod.Testbed):
 
             node.ifs = 0
             for ipcp in node.ipcps:
-                if type(ipcp) is mod.ShimEthIPCP:
+                if isinstance(ipcp, mod.ShimEthIPCP):
                     el3 = doc.createElement("interface")
                     self.if_id[ipcp] = node.name + ":if" + str(node.ifs)
                     el3.setAttribute("client_id", self.if_id[ipcp])
@@ -88,7 +88,7 @@ class Testbed(mod.Testbed):
                     el.appendChild(el3)
 
         for dif in experiment.dif_ordering:
-            if type(dif) is mod.ShimEthDIF:
+            if isinstance(dif, mod.ShimEthDIF):
                 el = doc.createElement("link")
                 top_el.appendChild(el)
                 el.setAttribute("client_id", dif.name)
@@ -108,7 +108,6 @@ class Testbed(mod.Testbed):
 
     def create_experiment(self, experiment):
         self.create_rspec(experiment)
-        self.manifest = self.exp_name + ".rrspec"
 
         for node in experiment.nodes:
             auth_name_r = self.auth_name.replace(".", "-")
@@ -140,7 +139,7 @@ class Testbed(mod.Testbed):
             for intf in intfs:
                 i_name = intf.getAttribute("client_id")
                 for ipcp in node_n.ipcps:
-                    if type(ipcp) is mod.ShimEthIPCP:
+                    if isinstance(ipcp, mod.ShimEthIPCP):
                         if self.if_id[ipcp] == i_name:
                             comp_id = intf.getAttribute("component_id")
                             comp_arr = comp_id.split(":")
diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py
index 3f4cb4a..158f360 100644
--- a/rumba/testbeds/qemu.py
+++ b/rumba/testbeds/qemu.py
@@ -22,8 +22,7 @@ import rumba.model as mod
 
 # Fake testbed, useful for testing
 class Testbed(mod.Testbed):
-    def __init__(self, exp_name, username, proj_name = "ARCFIRE",
-                 password = ""):
+    def __init__(self, exp_name, username, proj_name="ARCFIRE", password=""):
         mod.Testbed.__init__(self, exp_name, username, password, proj_name)
 
     def create_experiment(self, experiment):