From 2320ac3349789551e9c7500dba03e04b9ac02f41 Mon Sep 17 00:00:00 2001 From: David Gibson Date: Fri, 10 Jun 2022 12:32:42 +1000 Subject: Don't abbreviate ip(8) arguments in examples and tests ip(8)'s ability to take abbreviated arguments (e.g. "li sh" instead of "link show") is very handy when using it interactively, but it doesn't make for very readable scripts and examples when shown that way. Signed-off-by: David Gibson --- test/udp/passt_in_ns | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test/udp/passt_in_ns') diff --git a/test/udp/passt_in_ns b/test/udp/passt_in_ns index b9b1a97..71bda04 100644 --- a/test/udp/passt_in_ns +++ b/test/udp/passt_in_ns @@ -39,7 +39,7 @@ check [ "__NS_MD5__" = "__MD5__" ] test UDP/IPv4: guest to host host :> __TEMP__ hostb (nc -u -q1 -4 -l 10003 & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) -gout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' +gout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' guest cat test.bin | nc -u -q1 -N __GW__ 10003 hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -79,8 +79,8 @@ check [ "__GUEST_MD5__" = "__MD5__" ] test UDP/IPv4: ns to guest (using namespace address) guestb (nc -u -q1 -4 -l 10001 & echo $! > nc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat nc.pid)) -nsout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' -nsout ADDR ip -j -4 ad sh|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' +nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +nsout ADDR ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' ns cat __TEMP_NS__ | nc -u -q1 -N __ADDR__ 10001 guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 @@ -104,8 +104,8 @@ check [ "__NS_MD5__" = "__MD5__" ] test UDP/IPv6: guest to host host :> __TEMP__ hostb (nc -u -q1 -6 -l 10003 & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) -gout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -gout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' +gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' +gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' guest cat test.bin | nc -u -q1 -N __GW6__%__IFNAME__ 10003 hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -130,7 +130,7 @@ check [ "__HOST_MD5__" = "__MD5__" ] test UDP/IPv6: ns to host (via tap) host :> __TEMP__ hostb (nc -u -q1 -6 -l 10003 & echo $! > __NC_PID__) | tee __TEMP__ | (grep -qm1 "END_OF_TEST" && kill $(cat __NC_PID__)) -nsout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' +nsout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' ns cat __TEMP_NS__ | nc -u -q1 -N __GW6__%__IFNAME__ 10003 hostw hout HOST_MD5 md5sum __TEMP__ | cut -d' ' -f1 @@ -145,7 +145,7 @@ check [ "__GUEST_MD5__" = "__MD5__" ] test UDP/IPv6: ns to guest (using namespace address) guestb (nc -u -q1 -6 -l 10001 & echo $! > nc.pid) | tee test.bin | (grep -qm1 "END_OF_TEST" && kill $(cat nc.pid)) -nsout ADDR6 ip -j -6 ad sh|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' +nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[0].local' ns cat __TEMP_NS__ | nc -u -q1 -N __ADDR6__ 10001 guestw gout GUEST_MD5 md5sum test.bin | cut -d' ' -f1 -- cgit v1.2.3