test-network: add tests for issue #11921

diff --git a/test/test-network/conf/21-vlan-test1.network b/test/test-network/conf/21-vlan-test1.network
new file mode 100644 (file)
index 0000000..afe1deb
--- /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 (file)
index 0000000..06307ff
--- /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 afe1debe081b766c2f79663e3816bc13e6893fe7..0cd901def89cbac6c34c172a97eb5be330f0b04b 100644 (file)
--- 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 (file)
index 363fc90..0000000
--- 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 757e6da6571e659c32a7e96e0e55d0c6fcaa3b6c..856960ad65f8d761f57b0adab3813fae2b07ff3e 100755 (executable)
--- 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()