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/tcp/passt_in_ns | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'test/tcp/passt_in_ns') diff --git a/test/tcp/passt_in_ns b/test/tcp/passt_in_ns index fc4c7f4..4229a3a 100644 --- a/test/tcp/passt_in_ns +++ b/test/tcp/passt_in_ns @@ -36,7 +36,7 @@ check [ "__NS_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: guest to host: big transfer hostb nc -4 -l 10003 > __TEMP_BIG__ -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_big.bin | nc -N __GW__ 10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -73,8 +73,8 @@ check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv4: ns to guest (using namespace address): big transfer guestb nc -4 -l 10001 > test_big.bin -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_BIG__ | nc -N __ADDR__ 10001 guestw gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 @@ -100,7 +100,7 @@ check [ "__NS_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv4: guest to host: small transfer hostb nc -4 -l 10003 > __TEMP_SMALL__ -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_small.bin | nc -N __GW__ 10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -158,8 +158,8 @@ check [ "__NS_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: guest to host: big transfer hostb nc -6 -l 10003 > __TEMP_BIG__ -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_big.bin | nc -N __GW6__%__IFNAME__ 10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -181,7 +181,7 @@ check [ "__HOST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: ns to host (via tap): big transfer hostb nc -6 -l 10003 > __TEMP_BIG__ -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_BIG__ | nc -N __GW6__%__IFNAME__ 10003 hostw hout HOST_MD5_BIG md5sum __TEMP_BIG__ | cut -d' ' -f1 @@ -196,7 +196,7 @@ check [ "__GUEST_MD5_BIG__" = "__MD5_BIG__" ] test TCP/IPv6: ns to guest (using namespace address): big transfer guestb nc -6 -l 10001 > test_big.bin -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_BIG__ | nc -N __ADDR6__ 10001 guestw gout GUEST_MD5_BIG md5sum test_big.bin | cut -d' ' -f1 @@ -218,8 +218,8 @@ check [ "__NS_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: guest to host: small transfer hostb nc -6 -l 10003 > __TEMP_SMALL__ -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_small.bin | nc -N __GW6__%__IFNAME__ 10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 @@ -241,7 +241,7 @@ check [ "__HOST_MD5_SMALL__" = "__MD5_SMALL__" ] test TCP/IPv6: ns to host (via tap): small transfer hostb nc -6 -l 10003 > __TEMP_SMALL__ -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_SMALL__ | nc -N __GW6__%__IFNAME__ 10003 hostw hout HOST_MD5_SMALL md5sum __TEMP_SMALL__ | cut -d' ' -f1 -- cgit v1.2.3