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/demo/passt | 10 +++++----- test/demo/pasta | 6 +++--- test/demo/podman | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) (limited to 'test/demo') diff --git a/test/demo/passt b/test/demo/passt index cf75c9b..d394a08 100644 --- a/test/demo/passt +++ b/test/demo/passt @@ -108,13 +108,13 @@ sleep 10 nl nl -guest ip li sh +guest ip link show sleep 3 say Guest is up. Let's configure IPv4 first... sleep 2 guest dhclient sleep 2 -guest ip ad sh +guest ip addr show sleep 5 nl @@ -140,7 +140,7 @@ say Now the other way around... using nl say the address of the default gateway. sleep 2 -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' sleep 5 hostb nc -l -p 31337 sleep 2 @@ -168,8 +168,8 @@ host sysctl -w net.ipv4.tcp_rmem="4096 524288 134217728" host sysctl -w net.ipv4.tcp_wmem="4096 524288 134217728" host sysctl -w net.ipv4.tcp_timestamps=0 -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' nl nl info Throughput in Gbps, latency in µs diff --git a/test/demo/pasta b/test/demo/pasta index 506d948..8b13b5e 100644 --- a/test/demo/pasta +++ b/test/demo/pasta @@ -73,13 +73,13 @@ host q nl nl -ns ip li sh +ns ip link show sleep 3 say Let's configure IPv4 first... sleep 2 ns dhclient sleep 2 -ns ip ad sh +ns ip addr show sleep 5 nl @@ -119,7 +119,7 @@ sleep 5 nl say or the address of the default gateway. sleep 2 -nsout GW ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' +nsout GW ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' sleep 5 hostb nc -l -p 31337 sleep 2 diff --git a/test/demo/podman b/test/demo/podman index 074dd85..3a73784 100644 --- a/test/demo/podman +++ b/test/demo/podman @@ -73,13 +73,13 @@ nl say We can observe some practical differences: nl -ns1b ip ad sh +ns1b ip addr show sleep 3 say - slirp4netns uses a predefined IPv4 address hl NS1 sleep 2 -ns2b ip ad sh +ns2b ip addr show sleep 3 say , nl @@ -103,7 +103,7 @@ sleep 2 nl say - same for routes: -ns1b ip ro sh +ns1b ip route show sleep 3 say slirp4netns defines its own nl @@ -112,8 +112,8 @@ hl NS1 sleep 2 say , pasta copies it from the host -ns2b ip ro sh -ns2b ip -6 ro sh +ns2b ip route show +ns2b ip -6 route show sleep 5 nl @@ -310,11 +310,11 @@ nl nl say Everything is set now, let's start sleep 2 -hout IFNAME ip -j li sh | jq -rM '.[] | select(.link_type == "ether").ifname' -hout ADDR4 ip -j -4 ad sh|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local' -hout ADDR6 ip -j -6 ad sh|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local' -hout GW4 ip -j -4 ro sh|jq -rM '.[] | select(.dst == "default").gateway' -hout GW6 ip -j -6 ro sh|jq -rM '.[] | select(.dst == "default").gateway' +hout IFNAME ip -j link show | jq -rM '.[] | select(.link_type == "ether").ifname' +hout ADDR4 ip -j -4 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local' +hout ADDR6 ip -j -6 addr show|jq -rM '.[] | select(.ifname == "__IFNAME__").addr_info[] | select(.scope == "global").local' +hout GW4 ip -j -4 route show|jq -rM '.[] | select(.dst == "default").gateway' +hout GW6 ip -j -6 route show|jq -rM '.[] | select(.dst == "default").gateway' nl nl -- cgit v1.2.3