aboutgitcodebugslistschat
path: root/test/ndp
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2022-06-10 12:32:42 +1000
committerStefano Brivio <sbrivio@redhat.com>2022-06-15 09:38:10 +0200
commit2320ac3349789551e9c7500dba03e04b9ac02f41 (patch)
tree693d5ed12c2eb19061e1fc6e871199012a2d8db0 /test/ndp
parent6703da44c16b9bdfc4d959db270961d8ab826570 (diff)
downloadpasst-2320ac3349789551e9c7500dba03e04b9ac02f41.tar
passt-2320ac3349789551e9c7500dba03e04b9ac02f41.tar.gz
passt-2320ac3349789551e9c7500dba03e04b9ac02f41.tar.bz2
passt-2320ac3349789551e9c7500dba03e04b9ac02f41.tar.lz
passt-2320ac3349789551e9c7500dba03e04b9ac02f41.tar.xz
passt-2320ac3349789551e9c7500dba03e04b9ac02f41.tar.zst
passt-2320ac3349789551e9c7500dba03e04b9ac02f41.zip
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 <david@gibson.dropbear.id.au>
Diffstat (limited to 'test/ndp')
-rw-r--r--test/ndp/passt12
-rw-r--r--test/ndp/pasta12
2 files changed, 12 insertions, 12 deletions
diff --git a/test/ndp/passt b/test/ndp/passt
index 33e97a3..155ff26 100644
--- a/test/ndp/passt
+++ b/test/ndp/passt
@@ -16,19 +16,19 @@ gtools ip jq sipcalc grep
htools ip jq sipcalc grep cut
test Interface name
-gout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname'
+gout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname'
guest ip link set dev __IFNAME__ up && sleep 2
-hout HOST_IFNAME ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").dev'
+hout HOST_IFNAME ip -j -4 route show|jq -rM '.[] | select(.dst == "default").dev'
check [ -n "__IFNAME__" ]
test SLAAC: prefix
-gout ADDR6 ip -j -6 ad sh|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global" and .prefixlen == 64).local'
+gout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global" and .prefixlen == 64).local'
gout PREFIX6 sipcalc __ADDR6__/64 | grep prefix | cut -d' ' -f4
-hout HOST_ADDR6 ip -j -6 ad sh|jq -rM '.[] | select(.ifname == "__HOST_IFNAME__").addr_info[] | select(.scope == "global").local'
+hout HOST_ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__HOST_IFNAME__").addr_info[] | select(.scope == "global").local'
hout HOST_PREFIX6 sipcalc __HOST_ADDR6__/64 | grep prefix | cut -d' ' -f4
check [ "__PREFIX6__" = "__HOST_PREFIX6__" ]
test SLAAC: route
-gout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway'
-hout HOST_GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway'
+gout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
+hout HOST_GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
check [ __GW6__ = __HOST_GW6__ ]
diff --git a/test/ndp/pasta b/test/ndp/pasta
index c3eceae..ef9dee7 100644
--- a/test/ndp/pasta
+++ b/test/ndp/pasta
@@ -16,20 +16,20 @@ nstools ip jq sipcalc grep cut
htools ip jq sipcalc grep cut
test Interface name
-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 ip link set dev __IFNAME__ up
sleep 2
-hout HOST_IFNAME ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").dev'
+hout HOST_IFNAME ip -j -4 route show|jq -rM '.[] | select(.dst == "default").dev'
check [ -n "__IFNAME__" ]
test SLAAC: prefix
-nsout ADDR6 ip -j -6 ad sh|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global" and .prefixlen == 64).local'
+nsout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global" and .prefixlen == 64).local'
nsout PREFIX6 sipcalc __ADDR6__/64 | grep prefix | cut -d' ' -f4
-hout HOST_ADDR6 ip -j -6 ad sh|jq -rM '.[] | select(.ifname == "__HOST_IFNAME__").addr_info[] | select(.scope == "global").local'
+hout HOST_ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__HOST_IFNAME__").addr_info[] | select(.scope == "global").local'
hout HOST_PREFIX6 sipcalc __HOST_ADDR6__/64 | grep prefix | cut -d' ' -f4
check [ "__PREFIX6__" = "__HOST_PREFIX6__" ]
test SLAAC: route
-nsout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway'
-hout HOST_GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway'
+nsout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
+hout HOST_GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway'
check [ __GW6__ = __HOST_GW6__ ]