diff options
| -rw-r--r-- | test/test-network/conf/25-qdisc-netem.network (renamed from test/test-network/conf/25-qdisc.network) | 0 | ||||
| -rw-r--r-- | test/test-network/conf/25-qdisc-tbf.network | 12 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 11 |
3 files changed, 20 insertions, 3 deletions
diff --git a/test/test-network/conf/25-qdisc.network b/test/test-network/conf/25-qdisc-netem.network index de8f7243ce..de8f7243ce 100644 --- a/test/test-network/conf/25-qdisc.network +++ b/test/test-network/conf/25-qdisc-netem.network diff --git a/test/test-network/conf/25-qdisc-tbf.network b/test/test-network/conf/25-qdisc-tbf.network new file mode 100644 index 0000000000..17ca42b920 --- /dev/null +++ b/test/test-network/conf/25-qdisc-tbf.network @@ -0,0 +1,12 @@ +[Match] +Name=test1 + +[Network] +IPv6AcceptRA=no +Address=10.1.2.4/16 + +[TrafficControlQueueingDiscipline] +Parent=root +TokenBufferFilterRate=0.5M +TokenBufferFilterBurst=5K +TokenBufferFilterLatencySec=70msec diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index ab6e11e0e5..9e91caf763 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1498,7 +1498,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): '25-neighbor-ip-dummy.network', '25-neighbor-ip.network', '25-nexthop.network', - '25-qdisc.network', + '25-qdisc-netem.network', + '25-qdisc-tbf.network', '25-route-ipv6-src.network', '25-route-static.network', '25-gateway-static.network', @@ -2057,15 +2058,19 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, '192.168.5.1') def test_qdisc(self): - copy_unit_to_networkd_unit_path('25-qdisc.network', '12-dummy.netdev') + copy_unit_to_networkd_unit_path('25-qdisc-netem.network', '12-dummy.netdev', + '25-qdisc-tbf.network', '11-dummy.netdev') start_networkd() - self.wait_online(['dummy98:routable']) + self.wait_online(['dummy98:routable', 'test1:routable']) output = check_output('tc qdisc show dev dummy98') print(output) self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%') self.assertRegex(output, 'limit 200 delay 100.0ms 13.0ms loss 20.5%') + output = check_output('tc qdisc show dev test1') + print(output) + self.assertRegex(output, 'rate 500Kbit burst 5000b lat 70.0ms') class NetworkdStateFileTests(unittest.TestCase, Utilities): links = [ |