Merge pull request #12147 from yuwata/network-gre-key-12144

network: make GRE and GRETAP support Key= or friends

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

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

test/test-network/conf/erspan.network

@@ -0,0 +1,6 @@
+[Match]
+Name=dummy98
+
+[Network]
+Tunnel=erspan99
+Tunnel=erspan98

test/test-network/systemd-networkd-tests.py

@@ -296,6 +296,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-wireguard-private-key.txt',
         '25-wireguard.netdev',
         '6rd.network',
+        'erspan.network',
         'gre.network',
         'gretap.network',
         'gretun.network',
@@ -735,9 +736,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'))