More pylint fixes...

This commit is contained in:
Bob Lantz
2014-12-04 02:57:36 -08:00
parent 18aab5b786
commit 4965421215
4 changed files with 41 additions and 29 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ class LinuxRouter( Node ):
class NetworkTopo( Topo ):
"A simple topology of a router with three subnets (one host in each)."
def build( self, **opts ):
def build( self, **_opts ):
router = self.addNode( 'r0', cls=LinuxRouter, ip='192.168.1.1/24' )
h1 = self.addHost( 'h1', ip='192.168.1.100/24',
defaultRoute='via 192.168.1.1' )
+10 -6
View File
@@ -13,8 +13,10 @@ Controller icon from http://semlabs.co.uk/
OpenFlow icon from https://www.opennetworking.org/
"""
# For now, tolerate long lines and long module
# pylint: disable=line-too-long,too-many-lines
# Miniedit needs some work in order to pass pylint...
# pylint: disable=line-too-long,too-many-lines,too-many-branches
# pylint: disable=too-many-statements,attribute-defined-outside-init
# pylint: disable=missing-docstring
MINIEDIT_VERSION = '2.2.0.1'
@@ -1573,7 +1575,7 @@ class MiniEdit( Frame ):
self.createDataLinkBindings()
self.link = self.linkWidget = None
f.close
f.close()
def findWidgetByName( self, name ):
for widget in self.widgetToItem:
@@ -2624,8 +2626,10 @@ class MiniEdit( Frame ):
# Ultimately we will either want to use a topo or
# mininet object here, probably.
def addLink( self, source, dest, linktype='data', linkopts={} ):
def addLink( self, source, dest, linktype='data', linkopts=None ):
"Add link to model."
if linkopts is None:
linkopts = {}
source.links[ dest ] = self.link
dest.links[ source ] = self.link
self.links[ self.link ] = {'type' :linktype,
@@ -3142,7 +3146,7 @@ class MiniEdit( Frame ):
return
self.net.nameToNode[ name ].cmd( 'iperf -s -p 5001 &' )
""" BELOW HERE IS THE TOPOLOGY IMPORT CODE """
### BELOW HERE IS THE TOPOLOGY IMPORT CODE ###
def parseArgs( self ):
"""Parse command-line args and return options object.
@@ -3562,7 +3566,7 @@ def addDictOption( opts, choicesDict, default, name, helpStr=None ):
if __name__ == '__main__':
setLogLevel( 'info' )
app = MiniEdit()
""" import topology if specified """
### import topology if specified ###
app.parseArgs()
app.importTopo()
+7 -10
View File
@@ -30,8 +30,9 @@ from mininet.util import quietRun
from mininet.log import error
class VLANHost( Host ):
"Host connected to VLAN interface"
def config( self, vlan=100, **params ):
def config( self, vlan=100, **params ):
"""Configure VLANHost according to (optional) parameters:
vlan: VLAN ID for default interface"""
@@ -90,7 +91,7 @@ class VLANStarTopo( Topo ):
self.addLink( h, s1 )
def exampleCustomTags( vlan ):
def exampleCustomTags():
"""Simple example that exercises VLANStarTopo"""
net = Mininet( topo=VLANStarTopo() )
@@ -110,16 +111,12 @@ if __name__ == '__main__':
setLogLevel( 'info' )
if not quietRun( 'which vconfig' ):
error( "Cannot find command 'vconfig'\nThe packge",
error( "Cannot find command 'vconfig'\nThe package",
"'vlan' is required in Ubuntu or Debian,",
"or 'vconfig' in Fedora\n" )
exit()
try:
vlan = int( sys.argv[ 1 ] )
except Exception:
vlan = None
if vlan:
exampleAllHosts( vlan )
if len( sys.argv ) >= 2:
exampleAllHosts( vlan=int( sys.argv[ 1 ] ) )
else:
exampleCustomTags( vlan )
exampleCustomTags()