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

Fix is_switch() to always succeed + whitespace edits.

Browse Source
This commit is contained in:
Bob Lantz
2012-03-20 15:45:46 -07:00
parent e52d0ee1de
commit 8bebd37759
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/topo.py
+3 -2
View File
@@ -16,7 +16,7 @@ setup for testing, and can even be emulated with the Mininet package.
# from networkx.classes.graph import Graph # from networkx.classes.graph import Graph
from networkx import Graph from networkx import Graph
from mininet.util import netParse, ipStr, irange, natural, naturalSeq from mininet.util import irange, natural, naturalSeq
class Topo(object): class Topo(object):
"Data center network representation for structured multi-trees." "Data center network representation for structured multi-trees."
@@ -113,7 +113,7 @@ class Topo(object):
def is_switch(self, n): def is_switch(self, n):
'''Returns true if node is a switch.''' '''Returns true if node is a switch.'''
info = self.node_info[n] info = self.node_info[n]
return info and info['is_switch'] return info and info.get('is_switch', False)
def switches(self, sort=True): def switches(self, sort=True):
'''Return switches. '''Return switches.
@@ -163,6 +163,7 @@ class Topo(object):
return info if info is not None else {} return info if info is not None else {}
def setNodeInfo( self, name, info ): def setNodeInfo( self, name, info ):
"Set metadata (dict) for node"
self.node_info[ name ] = info self.node_info[ name ] = info
@staticmethod @staticmethod