test-network: add more tests for SerializeTunneledPackets=, Key=, and friends

diff --git a/test/test-network/conf/25-gre-tunnel-local-any.netdev b/test/test-network/conf/25-gre-tunnel-local-any.netdev
index 69a92c6c444f87f620ba78f042ef6c9e9851ca49..36bc55690aee8e0b437460173c77a4c43d1241fb 100644 (file)
--- a/test/test-network/conf/25-gre-tunnel-local-any.netdev
+++ b/test/test-network/conf/25-gre-tunnel-local-any.netdev
@@ -5,3 +5,5 @@ Kind=gre
 [Tunnel]
 Local=any
 Remote=10.65.223.239
+Key=104
+SerializeTunneledPackets=false

diff --git a/test/test-network/conf/25-gre-tunnel-remote-any.netdev b/test/test-network/conf/25-gre-tunnel-remote-any.netdev
index 286b2699edf3f63b4f86a612b423db86a82d7b94..74c02c9c827b9dd255739d8cdecc8f849769ab04 100644 (file)
--- a/test/test-network/conf/25-gre-tunnel-remote-any.netdev
+++ b/test/test-network/conf/25-gre-tunnel-remote-any.netdev
@@ -5,3 +5,5 @@ Kind=gre
 [Tunnel]
 Local=10.65.223.238
 Remote=any
+Key=105
+SerializeTunneledPackets=false

diff --git a/test/test-network/conf/25-gre-tunnel.netdev b/test/test-network/conf/25-gre-tunnel.netdev
index 94d9320cdbb9bbcf16fce51383a8642c641284ac..89c7fe1266c9bb874224166207d1dede0adfeff1 100644 (file)
--- a/test/test-network/conf/25-gre-tunnel.netdev
+++ b/test/test-network/conf/25-gre-tunnel.netdev
@@ -5,3 +5,6 @@ Kind=gre
 [Tunnel]
 Local=10.65.223.238
 Remote=10.65.223.239
+InputKey=1.2.3.103
+OutputKey=1.2.4.103
+SerializeTunneledPackets=true

diff --git a/test/test-network/conf/25-gretap-tunnel-local-any.netdev b/test/test-network/conf/25-gretap-tunnel-local-any.netdev
index 19e8d61d629775c9deb99763088c500afccd6cf9..17abcf69fc92e8f3989fc06e34daa5072ed04f7c 100644 (file)
--- a/test/test-network/conf/25-gretap-tunnel-local-any.netdev
+++ b/test/test-network/conf/25-gretap-tunnel-local-any.netdev
@@ -5,3 +5,5 @@ Kind=gretap
 [Tunnel]
 Local=any
 Remote=10.65.223.239
+Key=107
+SerializeTunneledPackets=true

diff --git a/test/test-network/conf/25-gretap-tunnel.netdev b/test/test-network/conf/25-gretap-tunnel.netdev
index 769e7653e4c633a54d350f0c9bbf426940c0d644..912daf5bf148dba0fbfb48f48abef277a8fa472e 100644 (file)
--- a/test/test-network/conf/25-gretap-tunnel.netdev
+++ b/test/test-network/conf/25-gretap-tunnel.netdev
@@ -5,3 +5,5 @@ Kind=gretap
 [Tunnel]
 Local=10.65.223.238
 Remote=10.65.223.239
+Key=106
+SerializeTunneledPackets=true

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index d43301ae333e5e38b5fe0959282cbadd30c730b8..202ee7e2ca009582b2cd0ae2059ea1b214d5684c 100755 (executable)
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -572,12 +572,24 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun99']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gre remote 10.65.223.239 local 10.65.223.238 dev dummy98')
+        self.assertRegex(output, 'ikey 1.2.3.103')
+        self.assertRegex(output, 'okey 1.2.4.103')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun98']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gre remote 10.65.223.239 local any dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.104')
+        self.assertRegex(output, 'okey 0.0.0.104')
+        self.assertNotRegex(output, 'iseq')
+        self.assertNotRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretun97']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gre remote any local 10.65.223.238 dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.105')
+        self.assertRegex(output, 'okey 0.0.0.105')
+        self.assertNotRegex(output, 'iseq')
+        self.assertNotRegex(output, 'oseq')
 
     def test_ip6gre_tunnel(self):
         self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gre-tunnel.netdev', 'ip6gretun.network',
@@ -611,9 +623,17 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap99']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gretap remote 10.65.223.239 local 10.65.223.238 dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.106')
+        self.assertRegex(output, 'okey 0.0.0.106')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'gretap98']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'gretap remote 10.65.223.239 local any dev dummy98')
+        self.assertRegex(output, 'ikey 0.0.0.107')
+        self.assertRegex(output, 'okey 0.0.0.107')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
 
     def test_ip6gretap_tunnel(self):
         self.copy_unit_to_networkd_unit_path('12-dummy.netdev', '25-ip6gretap-tunnel.netdev', 'ip6gretap.network',
@@ -747,11 +767,18 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan99']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'erspan remote 172.16.1.100 local 172.16.1.200')
-        self.assertRegex(output, '101')
+        self.assertRegex(output, 'ikey 0.0.0.101')
+        self.assertRegex(output, 'okey 0.0.0.101')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
         output = subprocess.check_output(['ip', '-d', 'link', 'show', 'erspan98']).rstrip().decode('utf-8')
         print(output)
         self.assertRegex(output, 'erspan remote 172.16.1.100 local any')
         self.assertRegex(output, '102')
+        self.assertRegex(output, 'ikey 0.0.0.102')
+        self.assertRegex(output, 'okey 0.0.0.102')
+        self.assertRegex(output, 'iseq')
+        self.assertRegex(output, 'oseq')
 
     def test_tunnel_independent(self):
         self.copy_unit_to_networkd_unit_path('25-ipip-tunnel-independent.netdev')