picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test-network: add tests for issue #11921

This commit is contained in:
Yu Watanabe 2019-03-08 12:34:56 +09:00 committed by Lennart Poettering
parent 3a6797f19f
commit 7f45d738a6
5 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/test-network/conf/21-vlan-test1.network Normal file
View File

@ -0,0 +1,2 @@
[Match]
Name=test1

5
test/test-network/conf/21-vlan-test1.network.d/override.conf Normal file
View File

@ -0,0 +1,5 @@
[Network]
VLAN=vlan99
Address=192.168.24.5/24
Address=192.168.25.5/24
IPv6AcceptRA=false

6
test/test-network/conf/21-vlan.network
View File

@ -1,2 +1,6 @@
[Match]
Name=test1
Name=vlan99
[Network]
IPv6AcceptRA=false
Address=192.168.23.5/24

2
test/test-network/conf/21-vlan.network.d/override.conf
View File

@ -1,2 +0,0 @@
[Network]
VLAN=vlan99

13
test/test-network/systemd-networkd-tests.py
View File

@ -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()