test-network: test stacked erspan tunnels

diff --git a/test/test-network/conf/25-erspan-tunnel-local-any.netdev b/test/test-network/conf/25-erspan-tunnel-local-any.netdev
index cd7df3ada1b08b4c19c0f677892391bf4fd2a4de..e9eb1c1cfc3cf0ba42958063e92582d941f131c9 100644 (file)
--- a/test/test-network/conf/25-erspan-tunnel-local-any.netdev
+++ b/test/test-network/conf/25-erspan-tunnel-local-any.netdev
@@ -3,7 +3,6 @@ Name=erspan98
 Kind=erspan
 
 [Tunnel]
-Independent=true
 ERSPANIndex=124
 Local = any
 Remote = 172.16.1.100

diff --git a/test/test-network/conf/25-erspan-tunnel.netdev b/test/test-network/conf/25-erspan-tunnel.netdev
index 60da0e9dad42f0c2d1c5ea8a36b53ee728d0d220..86935e998ca73b2b41e89515356f0a79855e4a72 100644 (file)
--- a/test/test-network/conf/25-erspan-tunnel.netdev
+++ b/test/test-network/conf/25-erspan-tunnel.netdev
@@ -3,7 +3,6 @@ Name=erspan99
 Kind=erspan
 
 [Tunnel]
-Independent=true
 ERSPANIndex=123
 Local = 172.16.1.200
 Remote = 172.16.1.100

diff --git a/test/test-network/conf/erspan.network b/test/test-network/conf/erspan.network
new file mode 100644 (file)
index 0000000..49364c5
--- /dev/null
+++ b/test/test-network/conf/erspan.network
@@ -0,0 +1,6 @@
+[Match]
+Name=dummy98
+
+[Network]
+Tunnel=erspan99
+Tunnel=erspan98

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 1621d400b14d39250ed1b160f4ff87ad382d8605..f0851efb15e24d057cf805ca4f3b41180a822486 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -289,6 +289,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-wireguard-private-key.txt',
         '25-wireguard.netdev',
         '6rd.network',
+        'erspan.network',
         'gre.network',
         'gretap.network',
         'gretun.network',
@@ -728,9 +729,11 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     @expectedFailureIfERSPANModuleIsNotAvailable()
     def test_erspan_tunnel(self):
-        self.copy_unit_to_networkd_unit_path('25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev')
+        self.copy_unit_to_networkd_unit_path('12-dummy.netdev', 'erspan.network',
+                                             '25-erspan-tunnel.netdev', '25-erspan-tunnel-local-any.netdev')
         self.start_networkd()
 
+        self.assertTrue(self.link_exits('dummy98'))
         self.assertTrue(self.link_exits('erspan99'))
         self.assertTrue(self.link_exits('erspan98'))