diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-11 00:02:43 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-11 00:02:43 +0900 |
| commit | bfb68540d5016a107975ada8352ec843fa1c532e (patch) | |
| tree | 8a11dc77154f518af1b91b5a0243efb4e5ff6a8f /test | |
| parent | 393f783ed38f684e2d34a792b28a74ac466a73d4 (diff) | |
| parent | 886e07a9cf5d67e76591141902414443a1555ec7 (diff) | |
| download | systemd-bfb68540d5016a107975ada8352ec843fa1c532e.tar.gz | |
Merge pull request #14280 from yuwata/network-tbf-more
network: tc: add more options for TBF
Diffstat (limited to 'test')
| -rw-r--r-- | test/fuzz/fuzz-network-parser/directives.network | 4 | ||||
| -rw-r--r-- | test/test-network/conf/25-qdisc-tbf-and-sfq.network | 4 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network index 2a6f111d83..c3264522b4 100644 --- a/test/fuzz/fuzz-network-parser/directives.network +++ b/test/fuzz/fuzz-network-parser/directives.network @@ -272,5 +272,9 @@ NetworkEmulatorDuplicateRate= NetworkEmulatorPacketLimit= TokenBufferFilterRate= TokenBufferFilterBurst= +TokenBufferFilterLimitSize= +TokenBufferFilterMTUBytes= +TokenBufferFilterMPUBytes= +TokenBufferFilterPeakRate= TokenBufferFilterLatencySec= StochasticFairnessQueueingPerturbPeriodSec= diff --git a/test/test-network/conf/25-qdisc-tbf-and-sfq.network b/test/test-network/conf/25-qdisc-tbf-and-sfq.network index 7a6d3315a1..781add219f 100644 --- a/test/test-network/conf/25-qdisc-tbf-and-sfq.network +++ b/test/test-network/conf/25-qdisc-tbf-and-sfq.network @@ -7,9 +7,11 @@ Address=10.1.2.4/16 [TrafficControlQueueingDiscipline] Parent=root -TokenBufferFilterRate=0.5M +TokenBufferFilterRate=1G TokenBufferFilterBurst=5K TokenBufferFilterLatencySec=70msec +TokenBufferFilterPeakRate=100G +TokenBufferFilterMTUBytes=1M [TrafficControlQueueingDiscipline] Parent=clsact diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 7f63e59ed9..9d22d788dd 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -2097,7 +2097,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): output = check_output('tc qdisc show dev test1') print(output) self.assertRegex(output, 'qdisc tbf') - self.assertRegex(output, 'rate 500Kbit burst 5000b lat 70.0ms') + self.assertRegex(output, 'rate 1Gbit burst 5000b peakrate 100Gbit minburst 987500b lat 70.0ms') self.assertRegex(output, 'qdisc sfq') self.assertRegex(output, 'perturb 5sec') |