system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

test-network: update tests for ipv4acd

Browse source
This commit is contained in:
Yu Watanabe 2021-06-22 15:32:57 +09:00
parent d7ab6ef098
commit 4492443124
5 changed files with 35 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/test-network/conf/25-address-dad-veth99.network
View file

@ -1,8 +0,0 @@
[Match]
Name=veth99
[Network]
IPv6AcceptRA=no
[Address]
Address=192.168.100.10/24

4
test/test-network/conf/25-address-dad-veth-peer.network → test/test-network/conf/25-address-ipv4acd-veth99.network
View file

@ -1,9 +1,9 @@
[Match]
Name=veth-peer
Name=veth99
[Network]
IPv6AcceptRA=no
[Address]
Address=192.168.100.10/24
Address=192.168.100.11/24
DuplicateAddressDetection=ipv4

3
test/test-network/conf/25-address-ipv4acd-veth99.network.d/conflict-address.conf Normal file
View file

@ -0,0 +1,3 @@
[Address]
Address=192.168.100.10/24
DuplicateAddressDetection=ipv4

3
test/test-network/conf/dhcp-server-decline.network
View file

@ -3,12 +3,11 @@ Name=veth-peer
[Network]
Address=192.168.5.1/24
Address=192.168.5.10/24
IPv6AcceptRA=false
DHCPServer=yes
[DHCPServer]
PoolOffset=10
PoolSize=1
PoolSize=100
DNS=192.168.5.1
NTP=192.168.5.1

41
test/test-network/systemd-networkd-tests.py
View file

@ -1797,8 +1797,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
'23-active-slave.network',
'24-keep-configuration-static.network',
'24-search-domain.network',
'25-address-dad-veth-peer.network',
'25-address-dad-veth99.network',
'25-address-ipv4acd-veth99.network',
'25-address-link-section.network',
'25-address-peer-ipv4.network',
'25-address-static.network',
@ -1868,6 +1867,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
remove_routes(self.routes)
remove_links(self.links)
stop_networkd(show_logs=False)
call('ip netns del ns99', stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
def tearDown(self):
remove_blackhole_nexthops()
@ -1876,6 +1876,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
remove_links(self.links)
remove_unit_from_networkd_path(self.units)
stop_networkd(show_logs=True)
call('ip netns del ns99', stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
def test_address_static(self):
copy_unit_to_networkd_unit_path('25-address-static.network', '12-dummy.netdev')
@ -1929,19 +1930,33 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
for i in range(1,254):
self.assertIn(f'inet 10.3.3.{i}/16 brd 10.3.255.255', output)
def test_address_dad(self):
copy_unit_to_networkd_unit_path('25-address-dad-veth99.network', '25-address-dad-veth-peer.network',
'25-veth.netdev')
def test_address_ipv4acd(self):
check_output('ip netns add ns99')
check_output('ip link add veth99 type veth peer veth-peer')
check_output('ip link set veth-peer netns ns99')
check_output('ip link set veth99 up')
check_output('ip netns exec ns99 ip link set veth-peer up')
check_output('ip netns exec ns99 ip address add 192.168.100.10/24 dev veth-peer')
copy_unit_to_networkd_unit_path('25-address-ipv4acd-veth99.network', dropins=False)
start_networkd()
self.wait_online(['veth99:routable', 'veth-peer:degraded'])
self.wait_online(['veth99:routable'])
output = check_output('ip -4 address show dev veth99')
print(output)
self.assertRegex(output, '192.168.100.10/24')
self.assertNotIn('192.168.100.10/24', output)
self.assertIn('192.168.100.11/24', output)
output = check_output('ip -4 address show dev veth-peer')
copy_unit_to_networkd_unit_path('25-address-ipv4acd-veth99.network.d/conflict-address.conf')
run(*networkctl_cmd, 'reload', env=env)
time.sleep(1)
rc = call(*wait_online_cmd, '--timeout=10s', '--interface=veth99:routable', env=env)
self.assertTrue(rc == 1)
output = check_output('ip -4 address show dev veth99')
print(output)
self.assertNotRegex(output, '192.168.100.10/24')
self.assertNotIn('192.168.100.10/24', output)
self.assertIn('192.168.100.11/24', output)
def test_address_peer_ipv4(self):
# test for issue #17304
@ -4619,9 +4634,11 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-decline.network', 'dhcp-client-decline.network')
start_networkd()
self.wait_online(['veth-peer:carrier'])
rc = call(*wait_online_cmd, '--timeout=10s', '--interface=veth99:routable', env=env)
self.assertTrue(rc == 1)
self.wait_online(['veth99:routable', 'veth-peer:routable'])
output = check_output('ip -4 address show dev veth99 scope global dynamic')
print(output)
self.assertRegex(output, 'inet 192.168.5.[0-9]*/24 metric 1024 brd 192.168.5.255 scope global dynamic veth99')
class NetworkdIPv6PrefixTests(unittest.TestCase, Utilities):
links = ['veth99']