From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 3 Nov 2021 20:50:42 +0000 (+0900)
Subject: test-network: add testcases for CAKE settings
X-Git-Tag: v250-rc1~330^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F21226%2Fhead;p=thirdparty%2Fsystemd.git

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 9220a20bf56..b13720c6dde 100644
--- 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 9d12d6a6096..a68055086c8 100755
--- 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):