FIX: NF_density MAC addresses

[csit.git] / tests / dpdk / dpdk_scripts / run_l2fwd.sh

diff --git a/tests/dpdk/dpdk_scripts/run_l2fwd.sh b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
index 09cc112..0ec4f2d 100755 (executable)
--- a/tests/dpdk/dpdk_scripts/run_l2fwd.sh
+++ b/tests/dpdk/dpdk_scripts/run_l2fwd.sh
@@ -26,6 +26,8 @@ cpu_corelist="${1}"
 nb_cores="${2}"
 queue_nums="${3}"
 jumbo_frames="${4}"
+rxd="${5:-128}"
+txd="${6:-512}"
 arch="$(uname -m)"
 
 # DPDK prefers "arm64" to "aarch64" and does not allow arm64 native target.
@@ -42,7 +44,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 +71,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
@@ -112,8 +114,8 @@ if [ "${jumbo_frames}" = "yes" ]; then
         --rxq=${queue_nums} \
         --txq=$((${nb_cores} + 1)) \
         --burst=64 \
-        --rxd=1024 \
-        --txd=1024 \
+        --rxd=${rxd} \
+        --txd=${txd} \
         --disable-link-check \
         --auto-start"
 else
@@ -127,20 +129,20 @@ else
         --rxq=${queue_nums} \
         --txq=$((${nb_cores} + 1)) \
         --burst=64 \
-        --rxd=1024 \
-        --txd=1024 \
+        --rxd=${rxd} \
+        --txd=${txd} \
         --disable-link-check \
         --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}"
+    fgrep "Press enter to exit" "${TESTPMDLOG}"
     if [ "${?}" -eq "0" ]; then
-        cat "${TESTPMDLOG}"
         exit 0
     fi
     sleep 1
 done
+cat "${TESTPMDLOG}"
 
 exit 1