summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-12-08 05:55:49 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-12-10 01:28:38 +0900
commit886e07a9cf5d67e76591141902414443a1555ec7 (patch)
treef20a9820984a68cc4fe8951dd15372dce4da187f
parentdcfc23ae7713fc728555d62c8b7e02bc8b4658f2 (diff)
downloadsystemd-886e07a9cf5d67e76591141902414443a1555ec7.tar.gz
test-network: add tests for new TBF settings
-rw-r--r--test/test-network/conf/25-qdisc-tbf-and-sfq.network4
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py2
2 files changed, 4 insertions, 2 deletions
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')