diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-12 10:22:09 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-12 15:37:03 +0100 |
| commit | 9401e488555aa6d553fb5bab8fad4db4d4dfc58e (patch) | |
| tree | 8af31dc32a4ed7eee7a79386c12affebb8043d9b /test | |
| parent | network: tc: support more attributes for FQ-CoDel (diff) | |
| download | systemd-9401e488555aa6d553fb5bab8fad4db4d4dfc58e.tar.xz systemd-9401e488555aa6d553fb5bab8fad4db4d4dfc58e.zip | |
test-network: add a test case for the new settings of FQ-CoDel
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-network/conf/25-qdisc-netem-and-fqcodel.network | 7 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/test/test-network/conf/25-qdisc-netem-and-fqcodel.network b/test/test-network/conf/25-qdisc-netem-and-fqcodel.network index b7defa3313..0e2ad74176 100644 --- a/test/test-network/conf/25-qdisc-netem-and-fqcodel.network +++ b/test/test-network/conf/25-qdisc-netem-and-fqcodel.network @@ -15,3 +15,10 @@ NetworkEmulatorPacketLimit=100 [TrafficControlQueueingDiscipline] Parent=ingress FairQueuingControlledDelayPacketLimit=20480 +FairQueuingControlledDelayMemoryLimit=64M +FairQueuingControlledDelayFlows=2048 +FairQueuingControlledDelayTargetSec=10ms +FairQueuingControlledDelayIntervalSec=200ms +FairQueuingControlledDelayQuantum=1400 +FairQueuingControlledDelayECN=yes +FairQueuingControlledDelayCEThresholdSec=100ms diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 31ffba9dda..550bc3e00e 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2095,7 +2095,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, 'qdisc netem') self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%') self.assertRegex(output, 'qdisc fq_codel') - self.assertRegex(output, 'limit 20480p') + 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') print(output) self.assertRegex(output, 'qdisc tbf') |