From 7f45d738a62e308cdd2c7f45b0adfa1ee59b8554 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 8 Mar 2019 12:34:56 +0900 Subject: [PATCH] test-network: add tests for issue #11921 --- test/test-network/conf/21-vlan-test1.network | 2 ++ .../conf/21-vlan-test1.network.d/override.conf | 5 +++++ test/test-network/conf/21-vlan.network | 6 +++++- .../conf/21-vlan.network.d/override.conf | 2 -- test/test-network/systemd-networkd-tests.py | 13 ++++++++++++- 5 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 test/test-network/conf/21-vlan-test1.network create mode 100644 test/test-network/conf/21-vlan-test1.network.d/override.conf delete mode 100644 test/test-network/conf/21-vlan.network.d/override.conf diff --git a/test/test-network/conf/21-vlan-test1.network b/test/test-network/conf/21-vlan-test1.network new file mode 100644 index 00000000000..afe1debe081 --- /dev/null +++ b/test/test-network/conf/21-vlan-test1.network @@ -0,0 +1,2 @@ +[Match] +Name=test1 diff --git a/test/test-network/conf/21-vlan-test1.network.d/override.conf b/test/test-network/conf/21-vlan-test1.network.d/override.conf new file mode 100644 index 00000000000..06307ff3d96 --- /dev/null +++ b/test/test-network/conf/21-vlan-test1.network.d/override.conf @@ -0,0 +1,5 @@ +[Network] +VLAN=vlan99 +Address=192.168.24.5/24 +Address=192.168.25.5/24 +IPv6AcceptRA=false diff --git a/test/test-network/conf/21-vlan.network b/test/test-network/conf/21-vlan.network index afe1debe081..0cd901def89 100644 --- a/test/test-network/conf/21-vlan.network +++ b/test/test-network/conf/21-vlan.network @@ -1,2 +1,6 @@ [Match] -Name=test1 +Name=vlan99 + +[Network] +IPv6AcceptRA=false +Address=192.168.23.5/24 diff --git a/test/test-network/conf/21-vlan.network.d/override.conf b/test/test-network/conf/21-vlan.network.d/override.conf deleted file mode 100644 index 363fc90d7be..00000000000 --- a/test/test-network/conf/21-vlan.network.d/override.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Network] -VLAN=vlan99 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 757e6da6571..856960ad65f 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -214,6 +214,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '12-dummy.netdev', '21-macvlan.netdev', '21-macvtap.netdev', + '21-vlan-test1.network', '21-vlan.netdev', '21-vlan.network', '25-6rd-tunnel.netdev', @@ -341,7 +342,8 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertEqual('1', self.read_link_attr('bond99', 'bonding', 'tlb_dynamic_lb')) def test_vlan(self): - self.copy_unit_to_networkd_unit_path('21-vlan.netdev', '11-dummy.netdev', '21-vlan.network') + self.copy_unit_to_networkd_unit_path('21-vlan.netdev', '11-dummy.netdev', + '21-vlan.network', '21-vlan-test1.network') self.start_networkd() self.assertTrue(self.link_exits('test1')) @@ -360,6 +362,15 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertTrue(output, 'MVRP') self.assertTrue(output, ' id 99 ') + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'test1']).rstrip().decode('utf-8') + print(output) + self.assertRegex(output, 'inet 192.168.24.5/24 brd 192.168.24.255 scope global test1') + self.assertRegex(output, 'inet 192.168.25.5/24 brd 192.168.25.255 scope global test1') + + output = subprocess.check_output(['ip', '-4', 'address', 'show', 'dev', 'vlan99']).rstrip().decode('utf-8') + print(output) + 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() -- 2.47.3