From 1578266b027896dc63d2b3bfe60468c626f8c2ba Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 17 Sep 2020 17:18:48 +0900
Subject: [PATCH] test-network: add tests for FQ-PIE

---
 .../test-network/conf/25-qdisc-fq_pie.network | 11 ++++++++
 test/test-network/systemd-networkd-tests.py   | 26 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 test/test-network/conf/25-qdisc-fq_pie.network

diff --git a/test/test-network/conf/25-qdisc-fq_pie.network b/test/test-network/conf/25-qdisc-fq_pie.network
new file mode 100644
index 0000000000..9ba23328c8
--- /dev/null
+++ b/test/test-network/conf/25-qdisc-fq_pie.network
@@ -0,0 +1,11 @@
+[Match]
+Name=dummy98
+
+[Network]
+IPv6AcceptRA=no
+Address=10.1.2.3/16
+
+[FlowQueuePIE]
+Parent=root
+Handle=3a
+PacketLimit=200000
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 12f91bf3c9..40254dcdb0 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -233,6 +233,18 @@ def expectedFailureIfETSIsNotAvailable():
 
     return f
 
+def expectedFailureIfFQPIEIsNotAvailable():
+    def f(func):
+        call('ip link add dummy98 type dummy', stderr=subprocess.DEVNULL)
+        rc = call('tc qdisc add dev dummy98 parent root fq_pie', stderr=subprocess.DEVNULL)
+        call('ip link del dummy98', stderr=subprocess.DEVNULL)
+        if rc == 0:
+            return func
+        else:
+            return unittest.expectedFailure(func)
+
+    return f
+
 def setUpModule():
     global running_units
 
@@ -1714,6 +1726,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
         '25-qdisc-clsact-and-htb.network',
         '25-qdisc-drr.network',
         '25-qdisc-ets.network',
+        '25-qdisc-fq_pie.network',
         '25-qdisc-hhf.network',
         '25-qdisc-ingress-netem-compat.network',
         '25-qdisc-pie.network',
@@ -2647,11 +2660,24 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
 
         output = check_output('tc qdisc show dev dummy98')
         print(output)
+
         self.assertRegex(output, 'qdisc ets 3a: root')
         self.assertRegex(output, 'bands 10 strict 3')
         self.assertRegex(output, 'quanta 1 2 3 4 5')
         self.assertRegex(output, 'priomap 3 4 5 6 7')
 
+    @expectedFailureIfFQPIEIsNotAvailable()
+    def test_qdisc_fq_pie(self):
+        copy_unit_to_networkd_unit_path('25-qdisc-fq_pie.network', '12-dummy.netdev')
+        start_networkd()
+        self.wait_online(['dummy98:routable'])
+
+        output = check_output('tc qdisc show dev dummy98')
+        print(output)
+
+        self.assertRegex(output, 'qdisc fq_pie 3a: root')
+        self.assertRegex(output, 'limit 200000p')
+
     @expectedFailureIfNetdevsimWithSRIOVIsNotAvailable()
     def test_sriov(self):
         call('rmmod netdevsim', stderr=subprocess.DEVNULL)