picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test-network: add a test case for HTB

Browse source
This commit is contained in:
Yu Watanabe 2020-02-10 19:41:39 +09:00
parent b934ac3d6e
commit 931c8c824a
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test-network/conf/25-qdisc-teql.network → test/test-network/conf/25-qdisc-teql-and-htb.network
View file

@ -6,6 +6,10 @@ IPv6AcceptRA=no
Address=10.1.2.3/16
[TrivialLinkEqualizer]
Parent=ingress
Id=1
[HierarchyTokenBucket]
Parent=root
Handle=0002
Id=1
DefaultClass=30

8
test/test-network/systemd-networkd-tests.py
View file

@ -1626,7 +1626,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
'25-qdisc-ingress-root.network',
'25-qdisc-netem-and-fqcodel.network',
'25-qdisc-tbf-and-sfq.network',
'25-qdisc-teql.network',
'25-qdisc-teql-and-htb.network',
'25-route-ipv6-src.network',
'25-route-static.network',
'25-route-vrf.network',
@ -2309,7 +2309,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
self.assertRegex(output, 'qdisc ingress')
def test_qdisc4(self):
copy_unit_to_networkd_unit_path('25-qdisc-teql.network', '12-dummy.netdev')
copy_unit_to_networkd_unit_path('25-qdisc-teql-and-htb.network', '12-dummy.netdev')
check_output('modprobe sch_teql max_equalizers=2')
start_networkd()
@ -2317,7 +2317,9 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
output = check_output('tc qdisc show dev dummy98')
print(output)
self.assertRegex(output, 'qdisc teql1 2:')
self.assertRegex(output, 'qdisc teql1')
self.assertRegex(output, 'qdisc htb 2:')
self.assertRegex(output, r'default (0x30|30)')
class NetworkdStateFileTests(unittest.TestCase, Utilities):
links = [