diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-01-02 14:51:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-02 14:51:55 +0100 |
| commit | 49d418d4ab52206143c8e598c82b5c7843306d2b (patch) | |
| tree | f012364f22e7c71f211765edfa912e14965a6af7 /test | |
| parent | 412a6c646ced41ac9b12c4a4f97e34c0350e1040 (diff) | |
| parent | a3d35654517e72669d9426c109973c851b18f918 (diff) | |
| download | systemd-49d418d4ab52206143c8e598c82b5c7843306d2b.tar.gz | |
Merge pull request #14444 from yuwata/network-codel-more
network: more CoDel settings
Diffstat (limited to 'test')
| -rw-r--r-- | test/fuzz/fuzz-network-parser/directives.network | 4 | ||||
| -rw-r--r-- | test/test-network/conf/25-qdisc-fq-codel.network (renamed from test/test-network/conf/25-qdisc-fq.network) | 8 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 6 |
3 files changed, 16 insertions, 2 deletions
diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network index 6c306d6dd5..c8cb7d52f7 100644 --- a/test/fuzz/fuzz-network-parser/directives.network +++ b/test/fuzz/fuzz-network-parser/directives.network @@ -299,3 +299,7 @@ FairQueueTrafficPolicingOrphanMask= FairQueueTrafficPolicingPacing= FairQueueTrafficPolicingCEThresholdSec= ControlledDelayPacketLimit= +ControlledDelayTargetSec= +ControlledDelayIntervalSec= +ControlledDelayCEThresholdSec= +ControlledDelayECN= diff --git a/test/test-network/conf/25-qdisc-fq.network b/test/test-network/conf/25-qdisc-fq-codel.network index ce41ddf910..20bcca2e50 100644 --- a/test/test-network/conf/25-qdisc-fq.network +++ b/test/test-network/conf/25-qdisc-fq-codel.network @@ -16,3 +16,11 @@ FairQueueTrafficPolicingBuckets=512 FairQueueTrafficPolicingOrphanMask=511 FairQueueTrafficPolicingPacing=yes FairQueueTrafficPolicingCEThresholdSec=100ms + +[TrafficControlQueueingDiscipline] +Parent=clsact +ControlledDelayPacketLimit=2000 +ControlledDelayTargetSec=10ms +ControlledDelayIntervalSec=50ms +ControlledDelayECN=yes +ControlledDelayCEThresholdSec=100ms diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 6b59efa09d..3eadb1574d 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1562,7 +1562,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): '25-neighbor-ip-dummy.network', '25-neighbor-ip.network', '25-nexthop.network', - '25-qdisc-fq.network', + '25-qdisc-fq-codel.network', '25-qdisc-netem-and-fqcodel.network', '25-qdisc-tbf-and-sfq.network', '25-route-ipv6-src.network', @@ -2157,7 +2157,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, 'perturb 5sec') def test_qdisc2(self): - copy_unit_to_networkd_unit_path('25-qdisc-fq.network', '12-dummy.netdev') + copy_unit_to_networkd_unit_path('25-qdisc-fq-codel.network', '12-dummy.netdev') start_networkd() self.wait_online(['dummy98:routable']) @@ -2166,6 +2166,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, 'qdisc fq') self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511 quantum 1500 initial_quantum 13000 maxrate 1Mbit') + self.assertRegex(output, 'qdisc codel') + self.assertRegex(output, 'limit 2000p target 10.0ms ce_threshold 100.0ms interval 50.0ms ecn') class NetworkdStateFileTests(unittest.TestCase, Utilities): links = [ |