test-network: add testcases for CAKE settings

diff --git a/test/test-network/conf/25-qdisc-cake.network b/test/test-network/conf/25-qdisc-cake.network
index 9220a20bf56aea0adf2c00bba569de7bfe81dd62..b13720c6dde2c4bb794455e1002167581874dce8 100644 (file)
--- a/test/test-network/conf/25-qdisc-cake.network
+++ b/test/test-network/conf/25-qdisc-cake.network
@@ -9,5 +9,15 @@ Address=10.1.2.3/16
 [CAKE]
 Parent=root
 Handle=3a
-OverheadBytes=128
 Bandwidth=500M
+AutoRateIngress=yes
+OverheadBytes=128
+MPUBytes=20
+CompensationMode=atm
+UseRawPacketSize=yes
+FlowIsolationMode=dual-dst-host
+NAT=yes
+PriorityQueueingPreset=diffserv8
+FirewallMark=0xff00
+Wash=yes
+SplitGSO=yes

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 9d12d6a60965d6a4d3873cf5b3c8a83de7464fe9..a68055086c8cc9040a8eb6ce5f835494c7648dde 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -3262,9 +3262,19 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
 
         output = check_output('tc qdisc show dev dummy98')
         print(output)
-        self.assertRegex(output, 'qdisc cake 3a: root')
-        self.assertRegex(output, 'bandwidth 500Mbit')
-        self.assertRegex(output, 'overhead 128')
+        self.assertIn('qdisc cake 3a: root', output)
+        self.assertIn('bandwidth 500Mbit', output)
+        self.assertIn('autorate-ingress', output)
+        self.assertIn('diffserv8', output)
+        self.assertIn('dual-dsthost', output)
+        self.assertIn(' nat', output)
+        self.assertIn(' wash', output)
+        self.assertIn(' split-gso', output)
+        self.assertIn(' raw', output)
+        self.assertIn(' atm', output)
+        self.assertIn('overhead 128', output)
+        self.assertIn('mpu 20', output)
+        self.assertIn('fwmark 0xff00', output)
 
     @expectedFailureIfPIEIsNotAvailable()
     def test_qdisc_pie(self):