diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2022-06-10 12:32:44 +1000 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2022-06-15 09:38:10 +0200 |
| commit | e48373382f7c84175a0f61890e8f0164cdd2d329 (patch) | |
| tree | 513610472a9536e965ecd7b8b8a1dbca7b8c568f /test | |
| parent | ca0c33ae5b8a68806dd1c766e2f58ce24867f334 (diff) | |
| download | passt-e48373382f7c84175a0f61890e8f0164cdd2d329.tar passt-e48373382f7c84175a0f61890e8f0164cdd2d329.tar.gz passt-e48373382f7c84175a0f61890e8f0164cdd2d329.tar.bz2 passt-e48373382f7c84175a0f61890e8f0164cdd2d329.tar.lz passt-e48373382f7c84175a0f61890e8f0164cdd2d329.tar.xz passt-e48373382f7c84175a0f61890e8f0164cdd2d329.tar.zst passt-e48373382f7c84175a0f61890e8f0164cdd2d329.zip | |
Use dhclient instead of udhcpc
For some reason, the passt/pasta tests and examples use dhclient for
DHCPv6, but in most cases use udhcpc for DHCPv4. Change it to use dhclient
for both DHCPv4 and DHCPv6. This means one less tool we need for testing,
plus dhclient is easily available on Fedora whereas udhcpc is not.
Note that the passt tests still rely on udhcpc indirectly because mbuto
wants to put it into the guest images it generates.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'test')
| -rw-r--r-- | test/README.md | 2 | ||||
| -rw-r--r-- | test/dhcp/pasta | 4 | ||||
| -rwxr-xr-x | test/lib/setup | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/README.md b/test/README.md index 623e6e5..362690c 100644 --- a/test/README.md +++ b/test/README.md @@ -29,7 +29,7 @@ on a system, i.e. common utilities such as a shell are not included here. Example for Debian, and possibly most Debian-based distributions: build-essential git jq strace iperf3 qemu-system-x86 tmux sipcalc bc - clang-tidy cppcheck isc-dhcp-common udhcpc psmisc linux-cpupower + clang-tidy cppcheck isc-dhcp-common psmisc linux-cpupower netcat-openbsd fakeroot lz4 lm-sensors qemu-system-arm qemu-system-ppc qemu-system-misc qemu-system-x86 valgrind diff --git a/test/dhcp/pasta b/test/dhcp/pasta index e76454a..4652d09 100644 --- a/test/dhcp/pasta +++ b/test/dhcp/pasta @@ -12,7 +12,7 @@ # Author: Stefano Brivio <sbrivio@redhat.com> onlyfor pasta -nstools ip jq /sbin/udhcpc /sbin/dhclient +nstools ip jq /sbin/dhclient htools ip jq test Interface name @@ -20,7 +20,7 @@ nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifnam check [ -n "__IFNAME__" ] test DHCP: address -ns /sbin/udhcpc -i __IFNAME__ +ns /sbin/dhclient -4 --no-pid __IFNAME__ nsout ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' hout HOST_ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' check [ __ADDR__ = __HOST_ADDR__ ] diff --git a/test/lib/setup b/test/lib/setup index 32515bf..e57d97c 100755 --- a/test/lib/setup +++ b/test/lib/setup @@ -144,7 +144,7 @@ setup_passt_in_ns() { pane_run NS "ip -j link show | jq -rM '.[] | select(.link_type == \"ether\").ifname'" pane_wait NS __ifname="$(pane_parse NS)" - pane_run NS "/sbin/udhcpc -i ${__ifname}" + pane_run NS "/sbin/dhclient -4 --no-pid ${__ifname}" pane_status NS sleep 2 pane_run NS "/sbin/dhclient -6 --no-pid ${__ifname}" @@ -232,8 +232,8 @@ setup_two_guests() { pane_wait PASST_1 __ifname="$(pane_parse PASST_1)" - pane_run GUEST_1 "/sbin/udhcpc -i ${__ifname}" - pane_run GUEST_2 "/sbin/udhcpc -i ${__ifname}" + pane_run GUEST_1 "/sbin/dhclient -4 ${__ifname}" + pane_run GUEST_2 "/sbin/dhclient -4 ${__ifname}" pane_status GUEST_1 pane_status GUEST_2 sleep 2 |