lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Bob Lantz
2014-10-28 17:05:00 -07:00
parent 06d9e4bba7
commit eab4ea3fb9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/topo.py
+5 -6
View File
@@ -126,7 +126,7 @@ class Topo( object ):
returns: host name""" returns: host name"""
if not opts and self.hopts: if not opts and self.hopts:
opts = self.hopts opts = self.hopts
return self.addNode(name, **opts) return self.addNode( name, **opts )
def addSwitch( self, name, **opts ): def addSwitch( self, name, **opts ):
"""Convenience method: Add switch to graph. """Convenience method: Add switch to graph.
@@ -135,7 +135,7 @@ class Topo( object ):
returns: switch name""" returns: switch name"""
if not opts and self.sopts: if not opts and self.sopts:
opts = self.sopts opts = self.sopts
result = self.addNode(name, isSwitch=True, **opts) result = self.addNode( name, isSwitch=True, **opts )
return result return result
def addLink( self, node1, node2, port1=None, port2=None, def addLink( self, node1, node2, port1=None, port2=None,
@@ -146,9 +146,8 @@ class Topo( object ):
returns: link info key""" returns: link info key"""
if not opts and self.lopts: if not opts and self.lopts:
opts = self.lopts opts = self.lopts
port1, port2 = self.addPort(node1, node2, port1, port2) port1, port2 = self.addPort( node1, node2, port1, port2 )
opts.update( node1=node1, node2=node2, port1=port1, port2=port2 ) opts.update( node1=node1, node2=node2, port1=port1, port2=port2 )
assert 'node1' in opts
self.g.add_edge(node1, node2, key, opts ) self.g.add_edge(node1, node2, key, opts )
return key return key
@@ -179,7 +178,7 @@ class Topo( object ):
"""Return links. """Return links.
sort: sort links alphabetically sort: sort links alphabetically
withKeys: return key in tuple withKeys: return key in tuple
@return links list of ( src, dst [,key ] )""" returns: links list of ( src, dst [,key ] )"""
if not sort: if not sort:
return self.g.edges( data=withInfo, key=withKeys ) return self.g.edges( data=withInfo, key=withKeys )
else: else:
@@ -246,7 +245,7 @@ class Topo( object ):
def setlinkInfo( self, src, dst, info, key=None ): def setlinkInfo( self, src, dst, info, key=None ):
"Set link metadata dict" "Set link metadata dict"
entry, key = self._linkEntry( src, dst, key ) entry, key = self._linkEntry( src, dst, key )
entry [ key ] = info entry[ key ] = info
def nodeInfo( self, name ): def nodeInfo( self, name ):
"Return metadata (dict) for node" "Return metadata (dict) for node"