aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2020-01-22 16:38:39 +0100
committerJan Gelety <jgelety@cisco.com>2020-02-10 13:33:34 +0000
commitb968e370fe2737233f138ffd67a5bff75a6de091 (patch)
tree0d34bfd9d941c7fd40106f6a08a4586cc28b55b5 /tests
parentc34b584bec20a3239b204d9bb4e8b8e5ccfad6f2 (diff)
FIX: Detection if l2fwd/l3fwd is up/down
Change-Id: Ide5de222e8314a0ea0be59f9a478f8d59147f722 Signed-off-by: Jan Gelety <jgelety@cisco.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/dpdk/dpdk_scripts/cleanup_dpdk.sh8
-rwxr-xr-xtests/dpdk/dpdk_scripts/run_l2fwd.sh6
-rwxr-xr-xtests/dpdk/dpdk_scripts/run_l3fwd.sh6
3 files changed, 8 insertions, 12 deletions
diff --git a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
index a8624a8321..a97b4ba121 100755
--- a/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
+++ b/tests/dpdk/dpdk_scripts/cleanup_dpdk.sh
@@ -20,7 +20,7 @@ if [ $? -eq "0" ]; then
success=false
sudo pkill testpmd
echo "RC = $?"
- for attempt in {1..5}; do
+ for attempt in {1..60}; do
echo "Checking if testpmd is still alive, attempt nr ${attempt}"
sudo pgrep testpmd
if [ $? -eq "1" ]; then
@@ -47,7 +47,7 @@ if [ $? -eq "0" ]; then
success=false
sudo pkill l3fwd
echo "RC = $?"
- for attempt in {1..5}; do
+ for attempt in {1..60}; do
echo "Checking if l3fwd is still alive, attempt nr ${attempt}"
sudo pgrep l3fwd
if [ $? -eq "1" ]; then
@@ -83,8 +83,4 @@ sleep 2
if1_name=`./usertools/dpdk-devbind.py --s | grep "${port1_pci}" | sed -n 's/.*if=\(\S\)/\1/p' | awk -F' ' '{print $1}'`
if2_name=`./usertools/dpdk-devbind.py --s | grep "${port2_pci}" | sed -n 's/.*if=\(\S\)/\1/p' | awk -F' ' '{print $1}'`
-# Remove igb_uio driver
-rmmod igb_uio || \
- { echo "Removing igb_uio failed"; exit 1; }
-
cd ${PWDDIR}
diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index 09cc112998..f15461e254 100755
--- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@ -42,7 +42,7 @@ if [ ${?} -eq "0" ]; then
success=false
sudo pkill testpmd
echo "RC = ${?}"
- for attempt in {1..30}; do
+ for attempt in {1..60}; do
echo "Checking if testpmd is still alive, attempt nr ${attempt}"
sudo pgrep testpmd
if [ ${?} -eq "1" ]; then
@@ -69,7 +69,7 @@ if [ ${?} -eq "0" ]; then
success=false
sudo pkill l3fwd
echo "RC = ${?}"
- for attempt in {1..30}; do
+ for attempt in {1..60}; do
echo "Checking if l3fwd is still alive, attempt nr ${attempt}"
sudo pgrep l3fwd
if [ ${?} -eq "1" ]; then
@@ -133,7 +133,7 @@ else
--auto-start"
fi
-for attempt in {1..30}; do
+for attempt in {1..60}; do
echo "Checking if testpmd is alive, attempt nr ${attempt}"
fgrep "Port 1: link state change event" "${TESTPMDLOG}"
if [ "${?}" -eq "0" ]; then
diff --git a/tests/dpdk/dpdk_scripts/run_l3fwd.sh b/tests/dpdk/dpdk_scripts/run_l3fwd.sh
index 3940cd4809..bab7668f5c 100755
--- a/tests/dpdk/dpdk_scripts/run_l3fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l3fwd.sh
@@ -45,7 +45,7 @@ if [ ! -z "${l3fwd_pid}" ]; then
success=false
sudo kill -15 "${l3fwd_pid}"
echo "RC = ${?}"
- for attempt in {1..30}; do
+ for attempt in {1..60}; do
echo "Checking if l3fwd is still alive, attempt nr ${attempt}"
l3fwd_pid=`get_l3fwd_pid`
if [ -z "${l3fwd_pid}" ]; then
@@ -72,7 +72,7 @@ if [ ${?} -eq "0" ]; then
success=false
sudo pkill testpmd
echo "RC = ${?}"
- for attempt in {1..30}; do
+ for attempt in {1..60}; do
echo "Checking if testpmd is still alive, attempt nr ${attempt}"
sudo pgrep testpmd
if [ ${?} -eq "1" ]; then
@@ -113,7 +113,7 @@ else
--eth-dest=0,${adj_mac0} --eth-dest=1,${adj_mac1} --parse-ptype"
fi
-for attempt in {1..30}; do
+for attempt in {1..60}; do
echo "Checking if l3fwd is alive, attempt nr ${attempt}"
fgrep "L3FWD: entering main loop on lcore" "${L3FWDLOG}"
if [ "${?}" -eq "0" ]; then