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

bug fix: link config

Browse Source
This commit is contained in:
Nikhil Handigol
2012-05-17 17:05:37 +00:00
parent b91008345f
commit ae2ede7994
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mininet/link.py
+5 -6
View File
@@ -196,36 +196,35 @@ class TCIntf( Intf ):
# are specifying the correct sizes. For now I have used # are specifying the correct sizes. For now I have used
# the same settings we had in the mininet-hifi code. # the same settings we had in the mininet-hifi code.
if use_hfsc: if use_hfsc:
cmds = [ '%s qdisc add dev %s root handle 1:0 hfsc default 1', cmds += [ '%s qdisc add dev %s root handle 1:0 hfsc default 1',
'%s class add dev %s parent 1:0 classid 1:1 hfsc sc ' '%s class add dev %s parent 1:0 classid 1:1 hfsc sc '
+ 'rate %fMbit ul rate %fMbit' % ( bw, bw ) ] + 'rate %fMbit ul rate %fMbit' % ( bw, bw ) ]
elif use_tbf: elif use_tbf:
latency_us = 10 * 1500 * 8 / bw latency_us = 10 * 1500 * 8 / bw
cmds = ['%s qdisc add dev %s root handle 1: tbf ' + cmds += ['%s qdisc add dev %s root handle 1: tbf ' +
'rate %fMbit burst 15000 latency %fus' % 'rate %fMbit burst 15000 latency %fus' %
( bw, latency_us ) ] ( bw, latency_us ) ]
else: else:
cmds = [ '%s qdisc add dev %s root handle 1:0 htb default 1', cmds += [ '%s qdisc add dev %s root handle 1:0 htb default 1',
'%s class add dev %s parent 1:0 classid 1:1 htb ' + '%s class add dev %s parent 1:0 classid 1:1 htb ' +
'rate %fMbit burst 15k' % bw ] 'rate %fMbit burst 15k' % bw ]
parent = ' parent 1:1 ' parent = ' parent 1:1 '
# ECN or RED # ECN or RED
if enable_ecn: if enable_ecn:
cmds = [ '%s qdisc add dev %s' + parent + cmds += [ '%s qdisc add dev %s' + parent +
'handle 10: red limit 1000000 ' + 'handle 10: red limit 1000000 ' +
'min 20000 max 25000 avpkt 1000 ' + 'min 20000 max 25000 avpkt 1000 ' +
'burst 20 ' + 'burst 20 ' +
'bandwidth %fmbit probability 1 ecn' % bw ] 'bandwidth %fmbit probability 1 ecn' % bw ]
parent = ' parent 10: ' parent = ' parent 10: '
elif enable_red: elif enable_red:
cmds = [ '%s qdisc add dev %s' + parent + cmds += [ '%s qdisc add dev %s' + parent +
'handle 10: red limit 1000000 ' + 'handle 10: red limit 1000000 ' +
'min 20000 max 25000 avpkt 1000 ' + 'min 20000 max 25000 avpkt 1000 ' +
'burst 20 ' + 'burst 20 ' +
'bandwidth %fmbit probability 1' % bw ] 'bandwidth %fmbit probability 1' % bw ]
parent = ' parent 10: ' parent = ' parent 10: '
return cmds, parent return cmds, parent
@staticmethod @staticmethod