Skip to content

Commit 38d1255

Browse files
committed
test-network: add tests for qdisc Handle=
1 parent d8b2396 commit 38d1255

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

test/test-network/conf/25-qdisc-fq-codel.network

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Address=10.1.2.3/16
77

88
[FairQueueing]
99
Parent=root
10+
Handle=0003
1011
PacketLimit=1000
1112
FlowLimit=200
1213
Quantum=1500

test/test-network/conf/25-qdisc-netem-and-fqcodel.network

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Address=10.1.2.3/16
77

88
[NetworkEmulator]
99
Parent=root
10+
Handle=001f
1011
DelaySec=50ms
1112
DelayJitterSec=10ms
1213
LossRate=20%

test/test-network/conf/25-qdisc-tbf-and-sfq.network

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Address=10.1.2.4/16
77

88
[TokenBucketFilter]
99
Parent=root
10+
Handle=003f
1011
Rate=1G
1112
Burst=5K
1213
LatencySec=70msec

test/test-network/conf/25-qdisc-teql.network

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ Address=10.1.2.3/16
77

88
[TrivialLinkEqualizer]
99
Parent=root
10+
Handle=0002
1011
Id=1

test/test-network/systemd-networkd-tests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2243,13 +2243,13 @@ def test_qdisc(self):
22432243

22442244
output = check_output('tc qdisc show dev dummy98')
22452245
print(output)
2246-
self.assertRegex(output, 'qdisc netem')
2246+
self.assertRegex(output, 'qdisc netem 1f:')
22472247
self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%')
22482248
self.assertRegex(output, 'qdisc fq_codel')
22492249
self.assertRegex(output, 'limit 20480p flows 2048 quantum 1400 target 10.0ms ce_threshold 100.0ms interval 200.0ms memory_limit 64Mb ecn')
22502250
output = check_output('tc qdisc show dev test1')
22512251
print(output)
2252-
self.assertRegex(output, 'qdisc tbf')
2252+
self.assertRegex(output, 'qdisc tbf 3f:')
22532253
self.assertRegex(output, 'rate 1Gbit burst 5000b peakrate 100Gbit minburst 987500b lat 70.0ms')
22542254
self.assertRegex(output, 'qdisc sfq')
22552255
self.assertRegex(output, 'perturb 5sec')
@@ -2263,7 +2263,7 @@ def test_qdisc2(self):
22632263

22642264
output = check_output('tc qdisc show dev dummy98')
22652265
print(output)
2266-
self.assertRegex(output, 'qdisc fq')
2266+
self.assertRegex(output, 'qdisc fq 3:')
22672267
self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511')
22682268
self.assertRegex(output, 'quantum 1500')
22692269
self.assertRegex(output, 'initial_quantum 13000')
@@ -2299,7 +2299,7 @@ def test_qdisc4(self):
22992299

23002300
output = check_output('tc qdisc show dev dummy98')
23012301
print(output)
2302-
self.assertRegex(output, 'qdisc teql1')
2302+
self.assertRegex(output, 'qdisc teql1 2:')
23032303

23042304
class NetworkdStateFileTests(unittest.TestCase, Utilities):
23052305
links = [

0 commit comments

Comments
 (0)