From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 20 May 2019 03:47:31 +0000 (+0900)
Subject: test-network: add tests for Flags= in [IPVLAN]
X-Git-Tag: v243-rc1~388^2~17
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=bc6dff6e255e1ea634342e71bf6dc7f219915241

test-network: add tests for Flags= in [IPVLAN]
---

diff --git a/test/test-network/conf/25-ipvlan.netdev b/test/test-network/conf/25-ipvlan.netdev
index 9921b787a13..d0f0c9a87e0 100644
--- a/test/test-network/conf/25-ipvlan.netdev
+++ b/test/test-network/conf/25-ipvlan.netdev
@@ -1,6 +1,3 @@
 [NetDev]
 Name=ipvlan99
 Kind=ipvlan
-
-[IPVLAN]
-Mode=L2
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index b53fbe651a8..c54fb3b83c3 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -547,10 +547,20 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
 
     @expectedFailureIfModuleIsNotAvailable('ipvlan')
     def test_ipvlan(self):
-        self.copy_unit_to_networkd_unit_path('25-ipvlan.netdev', '11-dummy.netdev', 'ipvlan.network')
-        self.start_networkd(0)
+        for mode, flag in [['L2', 'private'], ['L3', 'vepa'], ['L3S', 'bridge']]:
+            with self.subTest(mode=mode, flag=flag):
+                if mode != 'L2':
+                    self.tearDown()
+                self.copy_unit_to_networkd_unit_path('25-ipvlan.netdev', '11-dummy.netdev', 'ipvlan.network')
+                with open(os.path.join(network_unit_file_path, '25-ipvlan.netdev'), mode='a') as f:
+                    f.write('[IPVLAN]\nMode=' + mode + '\nFlags=' + flag)
 
-        self.wait_online(['ipvlan99:off', 'test1:degraded'])
+                self.start_networkd(0)
+                self.wait_online(['ipvlan99:off', 'test1:degraded'])
+
+                output = subprocess.check_output(['ip', '-d', 'link', 'show', 'ipvlan99'], universal_newlines=True).rstrip()
+                print(output)
+                self.assertRegex(output, 'ipvlan  *mode ' + mode.lower() + ' ' + flag)
 
     @expectedFailureIfModuleIsNotAvailable('ipvtap')
     def test_ipvtap(self):