From 92d2849f76c3395f9a51ab79a5726e1df5348ba8 Mon Sep 17 00:00:00 2001 From: Sander Vrijders Date: Tue, 28 Mar 2017 18:14:32 +0200 Subject: Fix pylint warnings and errors This fixes several warnings and errors as reported by pylint. --- rumba/testbeds/emulab.py | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'rumba/testbeds/emulab.py') 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) -- cgit v1.2.3