From 460feb61275c7cc2cdffa8183756d870f1be53af Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 20 May 2019 11:47:24 +0900 Subject: [PATCH] test-network: add tests for Mode= setting in [MACVTAP] section --- test/test-network/systemd-networkd-tests.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 5f6e1c5e1dc..b53fbe651a8 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -509,10 +509,20 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertRegex(output, 'inet 192.168.23.5/24 brd 192.168.23.255 scope global vlan99') def test_macvtap(self): - self.copy_unit_to_networkd_unit_path('21-macvtap.netdev', '11-dummy.netdev', 'macvtap.network') - self.start_networkd(0) + for mode in ['private', 'vepa', 'bridge', 'passthru']: + with self.subTest(mode=mode): + if mode != 'private': + self.tearDown() + self.copy_unit_to_networkd_unit_path('21-macvtap.netdev', '11-dummy.netdev', 'macvtap.network') + with open(os.path.join(network_unit_file_path, '21-macvtap.netdev'), mode='a') as f: + f.write('[MACVTAP]\nMode=' + mode) + self.start_networkd(0) - self.wait_online(['macvtap99:off', 'test1:degraded']) + self.wait_online(['macvtap99:off', 'test1:degraded']) + + output = subprocess.check_output(['ip', '-d', 'link', 'show', 'macvtap99'], universal_newlines=True).rstrip() + print(output) + self.assertRegex(output, 'macvtap mode ' + mode + ' ') def test_macvlan(self): for mode in ['private', 'vepa', 'bridge', 'passthru']: -- 2.39.2