From 9401e488555aa6d553fb5bab8fad4db4d4dfc58e Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 12 Dec 2019 18:22:09 +0900 Subject: [PATCH] test-network: add a test case for the new settings of FQ-CoDel --- test/test-network/conf/25-qdisc-netem-and-fqcodel.network | 7 +++++++ test/test-network/systemd-networkd-tests.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) 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 b7defa33131..0e2ad741762 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 31ffba9ddaf..550bc3e00e6 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') -- 2.47.3