test-network: add tests for new TBF settings

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 7a6d3315a186b12ad0d245aa6b78a14418106a6e..781add219f4f1ed191e0a193693866c6fe8e0dcc 100644 (file)
--- 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 7f63e59ed9bf5ae339ac2ac1973b4a149807d7b5..9d22d788ddb92672d402b431387d0b8e1250b6d4 100755 (executable)
--- 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')