diff options
| -rwxr-xr-x | testcases/network/virt/geneve01.sh | 4 | ||||
| -rw-r--r-- | testcases/network/virt/virt_lib.sh | 6 | ||||
| -rwxr-xr-x | testcases/network/virt/vlan03.sh | 10 | ||||
| -rwxr-xr-x | testcases/network/virt/vxlan03.sh | 4 | ||||
| -rwxr-xr-x | testcases/network/virt/vxlan04.sh | 4 |
5 files changed, 1 insertions, 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" |