picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test-network: add a test case for CoDel

Browse source
This commit is contained in:
Yu Watanabe 2019-12-28 22:25:49 +09:00
parent b078e52855
commit a3d3565451
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/test-network/conf/25-qdisc-fq.network → test/test-network/conf/25-qdisc-fq-codel.network
View file

@ -16,3 +16,11 @@ FairQueueTrafficPolicingBuckets=512
FairQueueTrafficPolicingOrphanMask=511
FairQueueTrafficPolicingPacing=yes
FairQueueTrafficPolicingCEThresholdSec=100ms
[TrafficControlQueueingDiscipline]
Parent=clsact
ControlledDelayPacketLimit=2000
ControlledDelayTargetSec=10ms
ControlledDelayIntervalSec=50ms
ControlledDelayECN=yes
ControlledDelayCEThresholdSec=100ms

6
test/test-network/systemd-networkd-tests.py
View file

@ -1562,7 +1562,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
'25-neighbor-ip-dummy.network',
'25-neighbor-ip.network',
'25-nexthop.network',
'25-qdisc-fq.network',
'25-qdisc-fq-codel.network',
'25-qdisc-netem-and-fqcodel.network',
'25-qdisc-tbf-and-sfq.network',
'25-route-ipv6-src.network',
@ -2157,7 +2157,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, 'perturb 5sec')
def test_qdisc2(self):
copy_unit_to_networkd_unit_path('25-qdisc-fq.network', '12-dummy.netdev')
copy_unit_to_networkd_unit_path('25-qdisc-fq-codel.network', '12-dummy.netdev')
start_networkd()
self.wait_online(['dummy98:routable'])
@ -2166,6 +2166,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
print(output)
self.assertRegex(output, 'qdisc fq')
self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511 quantum 1500 initial_quantum 13000 maxrate 1Mbit')
self.assertRegex(output, 'qdisc codel')
self.assertRegex(output, 'limit 2000p target 10.0ms ce_threshold 100.0ms interval 50.0ms ecn')
class NetworkdStateFileTests(unittest.TestCase, Utilities):
links = [