* [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error
@ 2020-09-30 10:28 Petr Vorel
2020-09-30 10:28 ` [LTP] [PATCH v2 2/2] virt_lib.sh: Remove checks for tst_ipaddr() output Petr Vorel
2020-09-30 11:43 ` [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error Petr Vorel
0 siblings, 2 replies; 3+ messages in thread
From: Petr Vorel @ 2020-09-30 10:28 UTC (permalink / raw)
To: ltp
we need return, continue was for original loop (in vxlan03.sh regression
from f275363d7, then copy pasted to vxlan04.sh).
Fixes: f275363d7 ("net/{stress,virt}: Migrate virt_lib.sh, ipsec_lib.sh + tests using them")
Fixes: 503b1cb1e ("network: add new gre02, geneve02, macsec03 and vxlan04 tests")
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
testcases/network/virt/vxlan03.sh | 2 +-
testcases/network/virt/vxlan04.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/network/virt/vxlan03.sh b/testcases/network/virt/vxlan03.sh
index 9ca303930..ef66a57fe 100755
--- a/testcases/network/virt/vxlan03.sh
+++ b/testcases/network/virt/vxlan03.sh
@@ -40,7 +40,7 @@ do_test()
tst_brk TBROK "you must specify IP address"
fi
- virt_check_cmd virt_add ltp_v0 id 0 $2 || continue
+ virt_check_cmd virt_add ltp_v0 id 0 $2 || return
tst_res TINFO "the same VNI must work"
# VNI is 24 bits long, so max value, which is not reserved, is 0xFFFFFE
diff --git a/testcases/network/virt/vxlan04.sh b/testcases/network/virt/vxlan04.sh
index 0351ea80f..a59b1183f 100755
--- a/testcases/network/virt/vxlan04.sh
+++ b/testcases/network/virt/vxlan04.sh
@@ -24,7 +24,7 @@ do_test()
tst_brk TBROK "you must specify IP address"
fi
- virt_check_cmd virt_add ltp_v0 id 0 $2 || continue
+ virt_check_cmd virt_add ltp_v0 id 0 $2 || return
tst_res TINFO "the same VNI must work"
# VNI is 24 bits long, so max value, which is not reserved, is 0xFFFFFE
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [LTP] [PATCH v2 2/2] virt_lib.sh: Remove checks for tst_ipaddr() output
2020-09-30 10:28 [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error Petr Vorel
@ 2020-09-30 10:28 ` Petr Vorel
2020-09-30 11:43 ` [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error Petr Vorel
1 sibling, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2020-09-30 10:28 UTC (permalink / raw)
To: ltp
+ now unused $ip_local and $ip_remote variables.
These checks were originally (before f275363d7) in tests which use
virt_compare_netperf also with variables.
It should be safe to expect tst_ipaddr() output to be safe even for SSH
based setup ("two host" configuration) due various checks in tst_net.sh.
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
testcases/network/virt/geneve01.sh | 4 ----
testcases/network/virt/virt_lib.sh | 6 ------
testcases/network/virt/vlan03.sh | 10 +---------
testcases/network/virt/vxlan03.sh | 4 ----
testcases/network/virt/vxlan04.sh | 4 ----
5 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/testcases/network/virt/geneve01.sh b/testcases/network/virt/geneve01.sh
index 9a746d5df..b731343c8 100755
--- a/testcases/network/virt/geneve01.sh
+++ b/testcases/network/virt/geneve01.sh
@@ -23,10 +23,6 @@ VIRT_PERF_THRESHOLD_MIN=160
do_test()
{
- if [ -z $ip_local -o -z $ip_remote ]; then
- tst_brk TBROK "you must specify IP address"
- fi
-
tst_res TINFO "the same VNI must work"
# VNI is 24 bits long, so max value, which is not reserved, is 0xFFFFFE
vxlan_setup_subnet_$vxlan_dst_addr "id 0xFFFFFE" "id 0xFFFFFE"
diff --git a/testcases/network/virt/virt_lib.sh b/testcases/network/virt/virt_lib.sh
index 827829633..cb2b2ba97 100644
--- a/testcases/network/virt/virt_lib.sh
+++ b/testcases/network/virt/virt_lib.sh
@@ -61,11 +61,9 @@ virt_lib_setup()
TST_NEEDS_ROOT=1
. tst_net.sh
-ip_local=$(tst_ipaddr)
ip_virt_local="$(TST_IPV6= tst_ipaddr_un)"
ip6_virt_local="$(TST_IPV6=6 tst_ipaddr_un)"
-ip_remote=$(tst_ipaddr rhost)
ip_virt_remote="$(TST_IPV6= tst_ipaddr_un rhost)"
ip6_virt_remote="$(TST_IPV6=6 tst_ipaddr_un rhost)"
@@ -376,10 +374,6 @@ virt_gre_setup()
[ "$TST_IPV6" ] && virt_type="ip6gre"
virt_lib_setup
- if [ -z $ip_local -o -z $ip_remote ]; then
- tst_brk TBROK "you must specify IP address"
- fi
-
tst_res TINFO "test $virt_type"
virt_setup "local $(tst_ipaddr) remote $(tst_ipaddr rhost) dev $(tst_iface)" \
"local $(tst_ipaddr rhost) remote $(tst_ipaddr) dev $(tst_iface rhost)"
diff --git a/testcases/network/virt/vlan03.sh b/testcases/network/virt/vlan03.sh
index adadd76fd..b7125ae7a 100755
--- a/testcases/network/virt/vlan03.sh
+++ b/testcases/network/virt/vlan03.sh
@@ -24,18 +24,10 @@ TST_NEEDS_TMPDIR=1
TST_TEST_DATA=",$p0 $lb0 $rh1,$p1 $lb1 $rh1"
TST_TEST_DATA_IFS=","
TST_TESTFUNC=do_test
-TST_SETUP=do_setup
+TST_SETUP=virt_lib_setup
TST_CLEANUP=virt_cleanup
. virt_lib.sh
-do_setup()
-{
- if [ -z $ip_local -o -z $ip_remote ]; then
- tst_brk TBROK "you must specify IP address"
- fi
- virt_lib_setup
-}
-
do_test()
{
virt_check_cmd virt_add ltp_v0 id 0 $2 || return
diff --git a/testcases/network/virt/vxlan03.sh b/testcases/network/virt/vxlan03.sh
index ef66a57fe..7e5453222 100755
--- a/testcases/network/virt/vxlan03.sh
+++ b/testcases/network/virt/vxlan03.sh
@@ -36,10 +36,6 @@ VIRT_PERF_THRESHOLD_MIN=160
do_test()
{
- if [ -z $ip_local -o -z $ip_remote ]; then
- tst_brk TBROK "you must specify IP address"
- fi
-
virt_check_cmd virt_add ltp_v0 id 0 $2 || return
tst_res TINFO "the same VNI must work"
diff --git a/testcases/network/virt/vxlan04.sh b/testcases/network/virt/vxlan04.sh
index a59b1183f..2418e5edd 100755
--- a/testcases/network/virt/vxlan04.sh
+++ b/testcases/network/virt/vxlan04.sh
@@ -20,10 +20,6 @@ VIRT_PERF_THRESHOLD_MIN=160
do_test()
{
- if [ -z $ip_local -o -z $ip_remote ]; then
- tst_brk TBROK "you must specify IP address"
- fi
-
virt_check_cmd virt_add ltp_v0 id 0 $2 || return
tst_res TINFO "the same VNI must work"
--
2.28.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error
2020-09-30 10:28 [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error Petr Vorel
2020-09-30 10:28 ` [LTP] [PATCH v2 2/2] virt_lib.sh: Remove checks for tst_ipaddr() output Petr Vorel
@ 2020-09-30 11:43 ` Petr Vorel
1 sibling, 0 replies; 3+ messages in thread
From: Petr Vorel @ 2020-09-30 11:43 UTC (permalink / raw)
To: ltp
Hi Alexey,
> we need return, continue was for original loop (in vxlan03.sh regression
> from f275363d7, then copy pasted to vxlan04.sh).
> Fixes: f275363d7 ("net/{stress,virt}: Migrate virt_lib.sh, ipsec_lib.sh + tests using them")
> Fixes: 503b1cb1e ("network: add new gre02, geneve02, macsec03 and vxlan04 tests")
FYI: Patchset merged.
Kind regards,
Petr
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-09-30 11:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-30 10:28 [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error Petr Vorel
2020-09-30 10:28 ` [LTP] [PATCH v2 2/2] virt_lib.sh: Remove checks for tst_ipaddr() output Petr Vorel
2020-09-30 11:43 ` [LTP] [PATCH v2 1/2] vxlan0{3,4}.sh: Fix exit on error Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox