Add new function "virt_check_cmd". Change TCONF to TINFO so that
we just skip not supported options and don't return TCONF as a
end test result.
Signed-off-by: Alexey Kodanev <alexey.koda...@oracle.com>
---
testcases/network/virt/ipvlan01.sh | 8 +-------
testcases/network/virt/macvlan01.sh | 8 +-------
testcases/network/virt/macvtap01.sh | 8 +-------
testcases/network/virt/virt_lib.sh | 19 ++++++++++++-------
testcases/network/virt/vlan03.sh | 7 +------
testcases/network/virt/vxlan03.sh | 7 +------
6 files changed, 17 insertions(+), 40 deletions(-)
diff --git a/testcases/network/virt/ipvlan01.sh
b/testcases/network/virt/ipvlan01.sh
index 2044fb8..706c1d8 100755
--- a/testcases/network/virt/ipvlan01.sh
+++ b/testcases/network/virt/ipvlan01.sh
@@ -35,13 +35,7 @@ virt_count=500
for m in $modes; do
tst_resm TINFO "add $virt_type with mode '$m'"
- virt_add ltp_v0 mode $m > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- tst_resm TCONF "iproute or kernel doesn't support mode '$m'"
- m=""
- else
- ROD_SILENT "ip li delete ltp_v0"
- fi
+ virt_check_cmd virt_add ltp_v0 mode $m || m=""
virt_add_delete_test "mode $m"
diff --git a/testcases/network/virt/macvlan01.sh
b/testcases/network/virt/macvlan01.sh
index aac9d02..35febd0 100755
--- a/testcases/network/virt/macvlan01.sh
+++ b/testcases/network/virt/macvlan01.sh
@@ -35,13 +35,7 @@ virt_count=500
for m in $modes; do
tst_resm TINFO "add $virt_type with mode '$m'"
- virt_add ltp_v0 mode $m > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- tst_resm TCONF "iproute or kernel doesn't support mode '$m'"
- m=""
- else
- ROD_SILENT "ip li delete ltp_v0"
- fi
+ virt_check_cmd virt_add ltp_v0 mode $m || m=""
virt_add_delete_test "mode $m"
diff --git a/testcases/network/virt/macvtap01.sh
b/testcases/network/virt/macvtap01.sh
index 8623080..8bb3636 100755
--- a/testcases/network/virt/macvtap01.sh
+++ b/testcases/network/virt/macvtap01.sh
@@ -35,13 +35,7 @@ virt_count=500
for m in $modes; do
tst_resm TINFO "add $virt_type with mode '$m'"
- virt_add ltp_v0 mode $m > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- tst_resm TCONF "iproute or kernel doesn't support mode '$m'"
- m=""
- else
- ROD_SILENT "ip li delete ltp_v0"
- fi
+ virt_check_cmd virt_add ltp_v0 mode $m || m=""
virt_add_delete_test "mode $m"
diff --git a/testcases/network/virt/virt_lib.sh
b/testcases/network/virt/virt_lib.sh
index b27bd6a..2ccba43 100644
--- a/testcases/network/virt/virt_lib.sh
+++ b/testcases/network/virt/virt_lib.sh
@@ -250,6 +250,17 @@ virt_compare_netperf()
return $ret
}
+virt_check_cmd()
+{
+ $@ > /dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ tst_resm TINFO "'$@' option(s) not supported, skipping it"
+ return 1
+ fi
+ ROD_SILENT "ip li delete ltp_v0"
+ return 0
+}
+
# Check if we can create then delete virtual interface n times.
# virt_test_01 [OPTIONS]
# OPTIONS - different options separated by comma.
@@ -270,13 +281,7 @@ virt_test_01()
tst_resm TINFO "add $virt_type with '$p'"
- virt_add ltp_v0 id 0 $p > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- tst_resm TCONF "iproute/kernel doesn't support '$p'"
- p=""
- else
- ROD_SILENT "ip li delete ltp_v0"
- fi
+ virt_check_cmd virt_add ltp_v0 id 0 $p || p=""
virt_multiple_add_test "$p"
diff --git a/testcases/network/virt/vlan03.sh b/testcases/network/virt/vlan03.sh
index 670a241..a067065 100755
--- a/testcases/network/virt/vlan03.sh
+++ b/testcases/network/virt/vlan03.sh
@@ -65,12 +65,7 @@ opts="$p0 $lb0 $rh0,$p0 $lb1 $rh1,$p1 $lb0 $rh0,$p1 $lb1
$rh1"
for n in $(seq 1 4); do
params="$(echo $opts | cut -d',' -f$n)"
- virt_add ltp_v0 id 0 $params > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- tst_resm TCONF "iproute or kernel doesn't support '$params'"
- continue
- fi
- ROD_SILENT "ip li delete ltp_v0"
+ virt_check_cmd virt_add ltp_v0 id 0 $params || continue
virt_setup "id 4094 $params" "id 4094 $params"
virt_compare_netperf || res="TFAIL"
diff --git a/testcases/network/virt/vxlan03.sh
b/testcases/network/virt/vxlan03.sh
index 14524d4..01fa62d 100755
--- a/testcases/network/virt/vxlan03.sh
+++ b/testcases/network/virt/vxlan03.sh
@@ -65,12 +65,7 @@ opts="dstport 0,dstport 0 gbp"
for n in $(seq 1 2); do
params="$(echo $opts | cut -d',' -f$n)"
- virt_add ltp_v0 id 0 $params > /dev/null 2>&1
- if [ $? -ne 0 ]; then
- tst_resm TCONF "iproute or kernel doesn't support '$params'"
- continue
- fi
- ROD_SILENT "ip li delete ltp_v0"
+ virt_check_cmd virt_add ltp_v0 id 0 $params || continue
tst_resm TINFO "networks with the same VNI must work"
# VNI is 24 bits long, so max value, which is not reserved, is 0xFFFFFE
--
1.7.1
------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
