]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: add tests for flags of tun or tap devices
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 20 May 2019 04:59:34 +0000 (13:59 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 22 May 2019 08:58:46 +0000 (17:58 +0900)
test/test-network/conf/25-tap.netdev
test/test-network/conf/25-tun.netdev
test/test-network/systemd-networkd-tests.py

index bf5e7fe52c18f1b879e7e40a10699daf1af82709..3876075a7a62d60b0af66d1aeb1fcfb28b0289af 100644 (file)
@@ -5,3 +5,4 @@ Kind=tap
 [Tap]
 MultiQueue=true
 PacketInfo=true
+VNetHeader=true
index 380ab21552f95b2fb65e6186f91af143994138cb..37459c79701b109c47698f8b1fb953de61a6089e 100644 (file)
@@ -5,3 +5,4 @@ Kind=tun
 [Tun]
 MultiQueue=true
 PacketInfo=true
+VNetHeader=true
index 40edc84d6559b5a1e8842622abe84418c483425a..dc2b96e2b22f5eb48bd8036ea137c1636f468ebe 100755 (executable)
@@ -602,12 +602,22 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
         self.wait_online(['tun99:off'])
 
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'tun99'], universal_newlines=True).rstrip()
+        print(output)
+        # Old ip command does not support IFF_ flags
+        self.assertRegex(output, 'tun (?:type tun pi on vnet_hdr on multi_queue|addrgenmode) ')
+
     def test_tap(self):
         self.copy_unit_to_networkd_unit_path('25-tap.netdev')
         self.start_networkd(0)
 
         self.wait_online(['tap99:off'])
 
+        output = subprocess.check_output(['ip', '-d', 'link', 'show', 'tap99'], universal_newlines=True).rstrip()
+        print(output)
+        # Old ip command does not support IFF_ flags
+        self.assertRegex(output, 'tun (?:type tap pi on vnet_hdr on multi_queue|addrgenmode) ')
+
     @expectedFailureIfModuleIsNotAvailable('vrf')
     def test_vrf(self):
         self.copy_unit_to_networkd_unit_path('25-vrf.netdev')