From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 10 Feb 2020 10:41:39 +0000 (+0900)
Subject: test-network: add a test case for HTB
X-Git-Tag: v246-rc1~781^2~14
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=931c8c824abd684e05552d335d13edfb2f086abf;p=thirdparty%2Fsystemd.git

test-network: add a test case for HTB
---

diff --git a/test/test-network/conf/25-qdisc-teql.network b/test/test-network/conf/25-qdisc-teql-and-htb.network
similarity index 68%
rename from test/test-network/conf/25-qdisc-teql.network
rename to test/test-network/conf/25-qdisc-teql-and-htb.network
index c8bb9034a29..d6e72013267 100644
--- a/test/test-network/conf/25-qdisc-teql.network
+++ b/test/test-network/conf/25-qdisc-teql-and-htb.network
@@ -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
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 6cc09235c60..b1af0bc2911 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -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 = [