diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-03 23:20:50 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-04 20:58:33 +0900 |
| commit | 0ab92791327177d39001ea2f4cc95bc78d75c572 (patch) | |
| tree | e6996ac886acc536d891937161503779087d189f /test | |
| parent | b2340fbb5ab3a3f37f1290d5ac1d604819e32ffd (diff) | |
| download | systemd-0ab92791327177d39001ea2f4cc95bc78d75c572.tar.gz | |
test-network: add a test case for SFQ
Diffstat (limited to 'test')
| -rw-r--r-- | test/test-network/conf/25-qdisc-tbf-and-sfq.network (renamed from test/test-network/conf/25-qdisc-tbf.network) | 4 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/test/test-network/conf/25-qdisc-tbf.network b/test/test-network/conf/25-qdisc-tbf-and-sfq.network index 17ca42b920..7a6d3315a1 100644 --- a/test/test-network/conf/25-qdisc-tbf.network +++ b/test/test-network/conf/25-qdisc-tbf-and-sfq.network @@ -10,3 +10,7 @@ Parent=root TokenBufferFilterRate=0.5M TokenBufferFilterBurst=5K TokenBufferFilterLatencySec=70msec + +[TrafficControlQueueingDiscipline] +Parent=clsact +StochasticFairnessQueueingPerturbPeriodSec=5sec diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 9e91caf763..f47463956e 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1499,7 +1499,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): '25-neighbor-ip.network', '25-nexthop.network', '25-qdisc-netem.network', - '25-qdisc-tbf.network', + '25-qdisc-tbf-and-sfq.network', '25-route-ipv6-src.network', '25-route-static.network', '25-gateway-static.network', @@ -2059,18 +2059,22 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): def test_qdisc(self): copy_unit_to_networkd_unit_path('25-qdisc-netem.network', '12-dummy.netdev', - '25-qdisc-tbf.network', '11-dummy.netdev') + '25-qdisc-tbf-and-sfq.network', '11-dummy.netdev') start_networkd() self.wait_online(['dummy98:routable', 'test1:routable']) output = check_output('tc qdisc show dev dummy98') print(output) + self.assertRegex(output, 'qdisc netem') 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, 'qdisc tbf') self.assertRegex(output, 'rate 500Kbit burst 5000b lat 70.0ms') + self.assertRegex(output, 'qdisc sfq') + self.assertRegex(output, 'perturb 5sec') class NetworkdStateFileTests(unittest.TestCase, Utilities): links = [ |