From 557fa421ffcee0cdc02e895267c68e18e4e8febd Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 12 Mar 2020 00:58:25 +0900 Subject: [PATCH] test-network: add a test case for DRR --- test/test-network/conf/25-qdisc-drr.network | 15 +++++++++++++++ test/test-network/systemd-networkd-tests.py | 14 ++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 test/test-network/conf/25-qdisc-drr.network diff --git a/test/test-network/conf/25-qdisc-drr.network b/test/test-network/conf/25-qdisc-drr.network new file mode 100644 index 0000000000..4632740061 --- /dev/null +++ b/test/test-network/conf/25-qdisc-drr.network @@ -0,0 +1,15 @@ +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Address=10.1.2.3/16 + +[DeficitRoundRobinScheduler] +Parent=root +Handle=0002 + +[DeficitRoundRobinSchedulerClass] +Parent=root +ClassId=0002:0030 +Quantum=2000 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index e5f75296b9..cb3be41a0b 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1647,6 +1647,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): '25-nexthop.network', '25-qdisc-cake.network', '25-qdisc-clsact-and-htb.network', + '25-qdisc-drr.network', '25-qdisc-ingress-netem-compat.network', '25-qdisc-pie.network', '25-route-ipv6-src.network', @@ -2343,6 +2344,19 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, 'class htb 2:39 root leaf 39:') self.assertRegex(output, 'prio 1 rate 1Mbit ceil 500Kbit') + def test_qdisc2(self): + copy_unit_to_networkd_unit_path('25-qdisc-drr.network', '12-dummy.netdev') + start_networkd() + + self.wait_online(['dummy98:routable']) + + output = check_output('tc qdisc show dev dummy98') + print(output) + self.assertRegex(output, 'qdisc drr 2: root') + output = check_output('tc class show dev dummy98') + print(output) + self.assertRegex(output, 'class drr 2:30 root quantum 2000b') + @expectedFailureIfCAKEIsNotAvailable() def test_qdisc_cake(self): copy_unit_to_networkd_unit_path('25-qdisc-cake.network', '12-dummy.netdev')