Edits to pass code check and make style consistent.

This commit is contained in:
Bob Lantz
2013-05-22 15:40:12 -07:00
parent 65c35b6595
commit 2485d57f66
2 changed files with 20 additions and 15 deletions
+2 -2
View File
@@ -290,8 +290,8 @@ class TCIntf( Intf ):
cmds += bwcmds
# Delay/jitter/loss/max_queue_size using netem
delaycmds, parent = self.delayCmds( delay=delay, jitter=jitter, loss=loss,
max_queue_size=max_queue_size,
delaycmds, parent = self.delayCmds( delay=delay, jitter=jitter,
loss=loss, max_queue_size=max_queue_size,
parent=parent )
cmds += delaycmds
+6 -1
View File
@@ -14,28 +14,33 @@ setup for testing, and can even be emulated with the Mininet package.
from mininet.util import irange, natural, naturalSeq
class Graph( object ):
"Utility class to track nodes and edges "
"Utility class to track nodes and edges - replaces networkx.Graph"
def __init__( self ):
self.data = {}
def add_node( self, node ):
"Add node to graph"
if node not in self.data.keys():
self.data[ node ] = []
def add_edge( self, src, dest ):
"Add edge to graph"
self.add_node( src )
self.add_node( dest )
self.data[ src ].append( dest )
def nodes( self ):
"Return list of graph nodes"
return self.data.keys()
def edges( self ):
"Iterator: return graph edges"
for src in self.data.keys():
for dest in self.data[ src ]:
yield ( src, dest )
class Topo(object):
"Data center network representation for structured multi-trees."