diff options
| -rw-r--r-- | resources/libraries/python/DPDK/DPDKTools.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/DPDK/L2fwdTest.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/DPDK/L3fwdTest.py | 2 | ||||
| -rwxr-xr-x | tests/dpdk/dpdk_scripts/cleanup_dpdk.sh | 8 | ||||
| -rwxr-xr-x | tests/dpdk/dpdk_scripts/run_l2fwd.sh | 6 | ||||
| -rwxr-xr-x | tests/dpdk/dpdk_scripts/run_l3fwd.sh | 6 |
6 files changed, 11 insertions, 15 deletions
diff --git a/resources/libraries/python/DPDK/DPDKTools.py b/resources/libraries/python/DPDK/DPDKTools.py index ecb23fb4c3..868d2d886d 100644 --- a/resources/libraries/python/DPDK/DPDKTools.py +++ b/resources/libraries/python/DPDK/DPDKTools.py @@ -86,7 +86,7 @@ class DPDKTools: f"/cleanup_dpdk.sh {if1_driver} {pci_address1} {if2_driver} " \ f"{pci_address2}" - ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600) + ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=1200) if ret_code != 0: raise RuntimeError( f"Failed to cleanup the dpdk at node {dut_node[u'host']}" diff --git a/resources/libraries/python/DPDK/L2fwdTest.py b/resources/libraries/python/DPDK/L2fwdTest.py index 56a055cfc5..de275f94af 100644 --- a/resources/libraries/python/DPDK/L2fwdTest.py +++ b/resources/libraries/python/DPDK/L2fwdTest.py @@ -52,7 +52,7 @@ class L2fwdTest: f"/run_l2fwd.sh {cpu_cores} {nb_cores} {queue_nums} {jumbo} " \ f"{arch}" - ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600) + ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=1800) if ret_code != 0: raise RuntimeError( f"Failed to execute l2fwd test at node {dut_node['host']}" diff --git a/resources/libraries/python/DPDK/L3fwdTest.py b/resources/libraries/python/DPDK/L3fwdTest.py index 0a045c01bf..18becabd9b 100644 --- a/resources/libraries/python/DPDK/L3fwdTest.py +++ b/resources/libraries/python/DPDK/L3fwdTest.py @@ -73,7 +73,7 @@ class L3fwdTest: f"\"{port_config.rstrip(u',')}\" " \ f"{adj_mac0} {adj_mac1} {u'yes' if jumbo_frames else u'no'}" - ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=600) + ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=1800) if ret_code != 0: raise Exception( f"Failed to execute l3fwd test at node {dut_node[u'host']}" 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 |