From 5f7f1f824fdd238bdb1712dc54d11c20bdc309c8 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Dec 2021 09:02:37 +0900 Subject: [PATCH 1/2] test-network: make start_isc_dhcpd() take IP version --- test/test-network/systemd-networkd-tests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index b8655db370..3d25704832 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -547,9 +547,9 @@ def remove_dnsmasq_log_file(): if os.path.exists(dnsmasq_log_file): os.remove(dnsmasq_log_file) -def start_isc_dhcpd(interface, conf_file): +def start_isc_dhcpd(interface, conf_file, ip): conf_file_path = os.path.join(networkd_ci_path, conf_file) - isc_dhcpd_command = f'dhcpd -6 -cf {conf_file_path} -lf {isc_dhcpd_lease_file} -pf {isc_dhcpd_pid_file} {interface}' + isc_dhcpd_command = f'dhcpd {ip} -cf {conf_file_path} -lf {isc_dhcpd_lease_file} -pf {isc_dhcpd_pid_file} {interface}' Path(isc_dhcpd_lease_file).touch() check_output(isc_dhcpd_command) @@ -5048,7 +5048,7 @@ class NetworkdDHCP6PDTests(unittest.TestCase, Utilities): start_networkd() self.wait_online(['veth-peer:carrier']) - start_isc_dhcpd('veth-peer', 'isc-dhcpd-dhcp6pd.conf') + start_isc_dhcpd('veth-peer', 'isc-dhcpd-dhcp6pd.conf', ip='-6') self.wait_online(['veth-peer:routable', 'veth99:routable', 'test1:routable', 'dummy98:routable', 'dummy99:degraded', 'veth97:routable', 'veth97-peer:routable', 'veth98:routable', 'veth98-peer:routable']) From 133f65ef2cd7f8dbc4822837f20a152b311d76af Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 6 Dec 2021 09:04:52 +0900 Subject: [PATCH 2/2] test-network: start dhcpd after address is assigned --- test/test-network/systemd-networkd-tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 3d25704832..0e0e6987d7 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -5047,9 +5047,9 @@ class NetworkdDHCP6PDTests(unittest.TestCase, Utilities): '13-dummy.netdev', 'dhcp6pd-downstream-dummy99.network') start_networkd() - self.wait_online(['veth-peer:carrier']) + self.wait_online(['veth-peer:routable']) start_isc_dhcpd('veth-peer', 'isc-dhcpd-dhcp6pd.conf', ip='-6') - self.wait_online(['veth-peer:routable', 'veth99:routable', 'test1:routable', 'dummy98:routable', 'dummy99:degraded', + self.wait_online(['veth99:routable', 'test1:routable', 'dummy98:routable', 'dummy99:degraded', 'veth97:routable', 'veth97-peer:routable', 'veth98:routable', 'veth98-peer:routable']) print('### ip -6 address show dev veth-peer scope global')