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

test-network: add tests for qdisc Handle=

Browse source
This commit is contained in:
Yu Watanabe 2020-02-10 16:44:19 +09:00
parent d8b2396d34
commit 38d1255a52
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ Address=10.1.2.3/16
[FairQueueing] [FairQueueing]
Parent=root Parent=root
Handle=0003
PacketLimit=1000 PacketLimit=1000
FlowLimit=200 FlowLimit=200
Quantum=1500 Quantum=1500

1
test/test-network/conf/25-qdisc-netem-and-fqcodel.network
View file

@ -7,6 +7,7 @@ Address=10.1.2.3/16
[NetworkEmulator] [NetworkEmulator]
Parent=root Parent=root
Handle=001f
DelaySec=50ms DelaySec=50ms
DelayJitterSec=10ms DelayJitterSec=10ms
LossRate=20% LossRate=20%

1
test/test-network/conf/25-qdisc-tbf-and-sfq.network
View file

@ -7,6 +7,7 @@ Address=10.1.2.4/16
[TokenBucketFilter] [TokenBucketFilter]
Parent=root Parent=root
Handle=003f
Rate=1G Rate=1G
Burst=5K Burst=5K
LatencySec=70msec LatencySec=70msec

1
test/test-network/conf/25-qdisc-teql.network
View file

@ -7,4 +7,5 @@ Address=10.1.2.3/16
[TrivialLinkEqualizer] [TrivialLinkEqualizer]
Parent=root Parent=root
Handle=0002
Id=1 Id=1

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

@ -2243,13 +2243,13 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('tc qdisc show dev dummy98') output = check_output('tc qdisc show dev dummy98')
print(output) print(output)
self.assertRegex(output, 'qdisc netem') self.assertRegex(output, 'qdisc netem 1f:')
self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%') self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%')
self.assertRegex(output, 'qdisc fq_codel') self.assertRegex(output, 'qdisc fq_codel')
self.assertRegex(output, 'limit 20480p flows 2048 quantum 1400 target 10.0ms ce_threshold 100.0ms interval 200.0ms memory_limit 64Mb ecn') self.assertRegex(output, 'limit 20480p flows 2048 quantum 1400 target 10.0ms ce_threshold 100.0ms interval 200.0ms memory_limit 64Mb ecn')
output = check_output('tc qdisc show dev test1') output = check_output('tc qdisc show dev test1')
print(output) print(output)
self.assertRegex(output, 'qdisc tbf') self.assertRegex(output, 'qdisc tbf 3f:')
self.assertRegex(output, 'rate 1Gbit burst 5000b peakrate 100Gbit minburst 987500b lat 70.0ms') self.assertRegex(output, 'rate 1Gbit burst 5000b peakrate 100Gbit minburst 987500b lat 70.0ms')
self.assertRegex(output, 'qdisc sfq') self.assertRegex(output, 'qdisc sfq')
self.assertRegex(output, 'perturb 5sec') self.assertRegex(output, 'perturb 5sec')
@ -2263,7 +2263,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('tc qdisc show dev dummy98') output = check_output('tc qdisc show dev dummy98')
print(output) print(output)
self.assertRegex(output, 'qdisc fq') self.assertRegex(output, 'qdisc fq 3:')
self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511') self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511')
self.assertRegex(output, 'quantum 1500') self.assertRegex(output, 'quantum 1500')
self.assertRegex(output, 'initial_quantum 13000') self.assertRegex(output, 'initial_quantum 13000')
@ -2299,7 +2299,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('tc qdisc show dev dummy98') output = check_output('tc qdisc show dev dummy98')
print(output) print(output)
self.assertRegex(output, 'qdisc teql1') self.assertRegex(output, 'qdisc teql1 2:')
class NetworkdStateFileTests(unittest.TestCase, Utilities): class NetworkdStateFileTests(unittest.TestCase, Utilities):
links = [ links = [