test-network: add a test case for SFQ

diff --git a/test/test-network/conf/25-qdisc-tbf.network b/test/test-network/conf/25-qdisc-tbf-and-sfq.network
similarity index 67%
rename from test/test-network/conf/25-qdisc-tbf.network
rename to test/test-network/conf/25-qdisc-tbf-and-sfq.network
index 17ca42b920e19d43e3f781463b48d3128e60eab3..7a6d3315a186b12ad0d245aa6b78a14418106a6e 100644 (file)
--- 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 9e91caf763729b289f0c55b2c648d3d25b6b0cd2..f47463956e75455e4179b6d87bc0106dd8922c12 100755 (executable)
--- 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 = [