summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-07-06 06:43:28 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-07-06 08:23:10 +0900
commitc38d2d4d593b9d1a2aae3e58218df6f5768b3d2d (patch)
tree085c360f6379c80f5fb3b1fd7ac338ce45326256
parent1ccbb359a1ad63efb5e44d943b7747989b6166ab (diff)
downloadsystemd-c38d2d4d593b9d1a2aae3e58218df6f5768b3d2d.tar.gz
test-network: add tests for DHCP.UseRoutes=no with custom route settings
This adds test for b5799eeb0787deacb30d5984f6ac78f88f23b97e. Closes #12951.
-rw-r--r--test/test-network/conf/dhcp-client-use-routes-no.network18
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py33
2 files changed, 51 insertions, 0 deletions
diff --git a/test/test-network/conf/dhcp-client-use-routes-no.network b/test/test-network/conf/dhcp-client-use-routes-no.network
new file mode 100644
index 0000000000..0c97ef5d8a
--- /dev/null
+++ b/test/test-network/conf/dhcp-client-use-routes-no.network
@@ -0,0 +1,18 @@
+[Match]
+Name=veth99
+
+[Network]
+DHCP=ipv4
+IPv6AcceptRA=no
+
+[Route]
+Destination=192.168.5.0/24
+
+[Route]
+Destination=192.168.6.0/24
+
+[Route]
+Destination=192.168.7.0/24
+
+[DHCP]
+UseRoutes=no
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index ba8fb7255f..7aacad296d 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -2119,6 +2119,7 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
'dhcp-client-listen-port.network',
'dhcp-client-route-metric.network',
'dhcp-client-route-table.network',
+ 'dhcp-client-use-routes-no.network',
'dhcp-client-vrf.network',
'dhcp-client-with-ipv4ll-fallback-with-dhcp-server.network',
'dhcp-client-with-ipv4ll-fallback-without-dhcp-server.network',
@@ -2295,6 +2296,38 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
print(output)
self.assertRegex(output, 'metric 24')
+ def test_dhcp_client_use_routes_no(self):
+ copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network',
+ 'dhcp-client-use-routes-no.network')
+ start_networkd()
+ wait_online(['veth-peer:carrier'])
+ start_dnsmasq(lease_time='2m')
+ wait_online(['veth99:routable', 'veth-peer:routable'])
+
+ output = check_output('ip address show dev veth99 scope global')
+ print(output)
+ self.assertRegex(output, r'inet 192.168.5.[0-9]*/24 brd 192.168.5.255 scope global dynamic veth99')
+
+ output = check_output('ip route show dev veth99')
+ print(output)
+ self.assertRegex(output, r'192.168.5.0/24 proto kernel scope link src 192.168.5.[0-9]*')
+ self.assertRegex(output, r'192.168.5.0/24 proto static')
+ self.assertRegex(output, r'192.168.6.0/24 proto static')
+ self.assertRegex(output, r'192.168.7.0/24 proto static')
+
+ # Sleep for 120 sec as the dnsmasq minimum lease time can only be set to 120
+ print('Wait for the dynamic address to be renewed')
+ time.sleep(125)
+
+ wait_online(['veth99:routable'])
+
+ output = check_output('ip route show dev veth99')
+ print(output)
+ self.assertRegex(output, r'192.168.5.0/24 proto kernel scope link src 192.168.5.[0-9]*')
+ self.assertRegex(output, r'192.168.5.0/24 proto static')
+ self.assertRegex(output, r'192.168.6.0/24 proto static')
+ self.assertRegex(output, r'192.168.7.0/24 proto static')
+
def test_dhcp_keep_configuration_dhcp(self):
copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-v4-server-veth-peer.network', 'dhcp-client-keep-configuration-dhcp.network')
start_networkd()