diff --git a/test/test-network/conf/dhcp-server-uplink.network b/test/test-network/conf/dhcp-server-uplink.network new file mode 100644 index 0000000000..aabf69debf --- /dev/null +++ b/test/test-network/conf/dhcp-server-uplink.network @@ -0,0 +1,8 @@ +[Match] +Name=dummy98 + +[Network] +IPv6AcceptRA=no +Address=192.168.5.2/24 +DNS=192.168.5.1 +NTP=192.168.5.1 diff --git a/test/test-network/conf/dhcp-server.network b/test/test-network/conf/dhcp-server.network index cb1f45b004..c3826a751e 100644 --- a/test/test-network/conf/dhcp-server.network +++ b/test/test-network/conf/dhcp-server.network @@ -9,5 +9,4 @@ DHCPServer=yes ServerAddress=192.168.5.1/24 PoolOffset=10 PoolSize=50 -DNS=192.168.5.1 -NTP=192.168.5.1 +UplinkInterface=dummy98 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 971e180b8f..f55020db7c 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -3668,16 +3668,22 @@ class NetworkdRATests(unittest.TestCase, Utilities): self.assertRegex(output, '2002:da8:2:0') class NetworkdDHCPServerTests(unittest.TestCase, Utilities): - links = ['veth99'] + links = [ + 'dummy98', + 'veth99', + ] units = [ + '12-dummy.netdev', '25-veth.netdev', 'dhcp-client.network', 'dhcp-client-static-lease.network', 'dhcp-client-timezone-router.network', 'dhcp-server.network', 'dhcp-server-static-lease.network', - 'dhcp-server-timezone-router.network'] + 'dhcp-server-timezone-router.network', + 'dhcp-server-uplink.network', + ] def setUp(self): remove_links(self.links) @@ -3689,7 +3695,8 @@ class NetworkdDHCPServerTests(unittest.TestCase, Utilities): stop_networkd(show_logs=True) def test_dhcp_server(self): - copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client.network', 'dhcp-server.network') + copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-client.network', 'dhcp-server.network', + '12-dummy.netdev', 'dhcp-server-uplink.network') start_networkd() self.wait_online(['veth99:routable', 'veth-peer:routable'])