From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 6 Dec 2021 00:47:46 +0000 (+0900)
Subject: test-network: support the case that the default config files are not installed yet
X-Git-Tag: v250-rc1~34^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F21625%2Fhead;p=thirdparty%2Fsystemd.git

test-network: support the case that the default config files are not installed yet
---

diff --git a/test/test-network/conf/80-6rd-tunnel.network b/test/test-network/conf/80-6rd-tunnel.network
new file mode 100644
index 00000000000..2e479eb1ac7
--- /dev/null
+++ b/test/test-network/conf/80-6rd-tunnel.network
@@ -0,0 +1,18 @@
+#  SPDX-License-Identifier: LGPL-2.1-or-later
+#
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# This network file matches 6rd-* SIT devices which is automatically created by
+# systemd-networkd when DHCPv4 6RD option is received.
+
+[Match]
+Name=6rd-*
+Type=sit
+
+[Network]
+DHCPPrefixDelegation=yes
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 57acd27f849..68cdad30ac5 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -5012,6 +5012,7 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities):
         '25-veth.netdev',
         '25-veth-downstream-veth97.netdev',
         '25-veth-downstream-veth98.netdev',
+        '80-6rd-tunnel.network',
         'dhcp-pd-downstream-dummy97.network',
         'dhcp-pd-downstream-dummy98.network',
         'dhcp-pd-downstream-dummy99.network',
@@ -5238,7 +5239,8 @@ class NetworkdDHCPPDTests(unittest.TestCase, Utilities):
                                         '11-dummy.netdev', 'dhcp-pd-downstream-test1.network',
                                         'dhcp-pd-downstream-dummy97.network',
                                         '12-dummy.netdev', 'dhcp-pd-downstream-dummy98.network',
-                                        '13-dummy.netdev', 'dhcp-pd-downstream-dummy99.network')
+                                        '13-dummy.netdev', 'dhcp-pd-downstream-dummy99.network',
+                                        '80-6rd-tunnel.network')
 
         start_networkd()
         self.wait_online(['veth-peer:routable'])