Merge pull request #14280 from yuwata/network-tbf-more

network: tc: add more options for TBF

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

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')