From 4ef289250f1c46fbe4f3559c6afaaeaa49a9a92a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 13 Dec 2019 21:12:41 +0900 Subject: [PATCH] test-network: add a test case for new FQ settings --- test/test-network/conf/25-qdisc-fq.network | 8 ++++++++ test/test-network/systemd-networkd-tests.py | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/test/test-network/conf/25-qdisc-fq.network b/test/test-network/conf/25-qdisc-fq.network index 10e0e5b859..ce41ddf910 100644 --- a/test/test-network/conf/25-qdisc-fq.network +++ b/test/test-network/conf/25-qdisc-fq.network @@ -8,3 +8,11 @@ Address=10.1.2.3/16 [TrafficControlQueueingDiscipline] Parent=root FairQueueTrafficPolicingPacketLimit=1000 +FairQueueTrafficPolicingFlowLimit=200 +FairQueueTrafficPolicingQuantum=1500 +FairQueueTrafficPolicingInitialQuantum=13000 +FairQueueTrafficPolicingMaximumRate=1M +FairQueueTrafficPolicingBuckets=512 +FairQueueTrafficPolicingOrphanMask=511 +FairQueueTrafficPolicingPacing=yes +FairQueueTrafficPolicingCEThresholdSec=100ms diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 30e2de8b0d..007d07c616 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2143,7 +2143,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output('tc qdisc show dev dummy98') print(output) self.assertRegex(output, 'qdisc fq') - self.assertRegex(output, 'limit 1000p') + self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511 quantum 1500 initial_quantum 13000 maxrate 1Mbit') class NetworkdStateFileTests(unittest.TestCase, Utilities): links = [