From da8fb7d7ab386fdefb728d71bfce9bb73624977c Mon Sep 17 00:00:00 2001 From: sharath Date: Tue, 9 Oct 2018 15:16:18 +0530 Subject: Migration of DMM-CSIT scripts to DMM repo Change-Id: Ibaa7652b24385805b5cdd1540ed98b09e68c69bc Signed-off-by: sharath --- tests/dmm/dmm_scripts/install_prereq.sh | 28 ------------------- tests/dmm/dmm_scripts/kill_given_proc.sh | 31 --------------------- tests/dmm/dmm_scripts/run_dmm.sh | 36 ------------------------ tests/dmm/dmm_scripts/run_dmm_with_lwip.sh | 44 ------------------------------ tests/dmm/dmm_scripts/setup_hugepage.sh | 37 ------------------------- tests/dmm/func/SingleCliSer-func.robot | 32 ++++++---------------- 6 files changed, 8 insertions(+), 200 deletions(-) delete mode 100755 tests/dmm/dmm_scripts/install_prereq.sh delete mode 100755 tests/dmm/dmm_scripts/kill_given_proc.sh delete mode 100755 tests/dmm/dmm_scripts/run_dmm.sh delete mode 100755 tests/dmm/dmm_scripts/run_dmm_with_lwip.sh delete mode 100755 tests/dmm/dmm_scripts/setup_hugepage.sh (limited to 'tests/dmm') diff --git a/tests/dmm/dmm_scripts/install_prereq.sh b/tests/dmm/dmm_scripts/install_prereq.sh deleted file mode 100755 index b03769ba6a..0000000000 --- a/tests/dmm/dmm_scripts/install_prereq.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -set -x -SCRIPT_DIR=`dirname $(readlink -f $0)` -ROOTDIR=$SCRIPT_DIR/../../../ - -cd ${ROOTDIR} -chmod +x *.deb -sudo dpkg -i libnuma1_2.0.11-1ubuntu1.1_amd64.deb -sudo dpkg -i libnuma-dev_2.0.11-1ubuntu1.1_amd64.deb -sudo dpkg -i ethtool_4.5-1_amd64.deb -sudo dpkg -i lsof_4.89+dfsg-0.1_amd64.deb - -DPDK_DOWNLOAD_PATH=$(cat $ROOTDIR/dmm/scripts/build_dpdk.sh | grep DPDK_DOWNLOAD_PATH= | cut -d "=" -f2) -sudo rm /tmp/dpdk -mkdir -p $DPDK_DOWNLOAD_PATH -mv $ROOTDIR/dpdk-18.02.tar.xz $DPDK_DOWNLOAD_PATH -# install DPDK -cp -f $ROOTDIR/dmm/scripts/build_dpdk.sh $ROOTDIR/dmm/scripts/build_dpdk_csit.sh -sed -i 's!wget.*!#comment wget!1' $ROOTDIR/dmm/scripts/build_dpdk_csit.sh -bash -x $ROOTDIR/dmm/scripts/build_dpdk_csit.sh - -sudo modprobe uio -sudo modprobe uio_pci_generic -sudo insmod $DPDK_DOWNLOAD_PATH/dpdk-18.02/x86_64-native-linuxapp-gcc/kmod/igb_uio.ko - -bash $SCRIPT_DIR/kill_given_proc.sh vs_epoll -bash $SCRIPT_DIR/setup_hugepage.sh diff --git a/tests/dmm/dmm_scripts/kill_given_proc.sh b/tests/dmm/dmm_scripts/kill_given_proc.sh deleted file mode 100755 index 772643a316..0000000000 --- a/tests/dmm/dmm_scripts/kill_given_proc.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -proc_name=$1 -sudo pgrep $proc_name -if [ $? -eq "0" ]; then - success=false - sudo pkill $proc_name - echo "RC = $?" - for attempt in {1..5}; do - echo "Checking if '$proc_name' is still alive, attempt nr ${attempt}" - sudo pgrep $proc_name - if [ $? -eq "1" ]; then - echo "'$proc_name' is dead" - success=true - break - fi - echo "'$proc_name' is still alive, waiting 1 second" - sleep 1 - done - if [ "$success" = false ]; then - echo "The command sudo pkill '$proc_name' failed" - sudo pkill -9 $proc_name - echo "RC = $?" - exit 1 - fi -else - echo "'$proc_name' is not running" -fi - -sleep 2 -exit 0 \ No newline at end of file diff --git a/tests/dmm/dmm_scripts/run_dmm.sh b/tests/dmm/dmm_scripts/run_dmm.sh deleted file mode 100755 index fd61fe842a..0000000000 --- a/tests/dmm/dmm_scripts/run_dmm.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -set -x - -CUR_DIR=`dirname $(readlink -f $0)` -ROOTDIR=$CUR_DIR/../../../ -APP_DIR=${ROOTDIR}/dmm/config/app_test -LIB_PATH=${ROOTDIR}/dmm/release/lib64 -DMM_SCRIPT_DIR=$ROOTDIR/dmm/scripts - -#proc_name => 0 = server, 1= client -proc_name=$1 -ifname=$2 -dut1_if_ip=$3 -dut2_if_ip=$4 - -ip addr -lspci -nn -lsmod | grep uio -bash kill_given_proc.sh vs_epoll - -cp -f $DMM_SCRIPT_DIR/prep_app_test.sh $DMM_SCRIPT_DIR/prep_app_test_csit.sh -sed -i 's!.*check_hugepage.sh!#skip hugepage check!1' $DMM_SCRIPT_DIR/prep_app_test_csit.sh -sed -i 's!enp0s8!'$ifname'!1' $DMM_SCRIPT_DIR/prep_app_test_csit.sh -bash -x $DMM_SCRIPT_DIR/prep_app_test_csit.sh - -cd $APP_DIR -ls -l -#only for kernal stack -if [ ${proc_name} -eq 0 ]; then -sudo LD_LIBRARY_PATH=${LIB_PATH} ./vs_epoll -p 20000 -d ${dut2_if_ip} -a 10000 -s ${dut1_if_ip} -l 200 -t 50000 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 -else -sudo LD_LIBRARY_PATH=${LIB_PATH} ./vc_common -p 20000 -d ${dut1_if_ip} -a 10000 -s ${dut2_if_ip} -l 200 -t 50000 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 -fi - -exit 0 \ No newline at end of file diff --git a/tests/dmm/dmm_scripts/run_dmm_with_lwip.sh b/tests/dmm/dmm_scripts/run_dmm_with_lwip.sh deleted file mode 100755 index 38b4c20978..0000000000 --- a/tests/dmm/dmm_scripts/run_dmm_with_lwip.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -set -x -CUR_DIR=`dirname $(readlink -f $0)` -ROOTDIR=$CUR_DIR/../../../ -APP_DIR=${ROOTDIR}/dmm/stacks/lwip_stack/app_test/ -LIB_PATH=${APP_DIR}/../release/lib64/ -VAG_DIR=${ROOTDIR}/dmm/stacks/lwip_stack/vagrant -#proc_name => 0 = server, 1= client -proc_name=$1 -ifname=$2 -dut1_if_ip=$3 -dut2_if_ip=$4 - -# Try to kill the vs_epoll -bash $CUR_DIR/kill_given_proc.sh vs_epoll -cat /proc/meminfo - -cp -f $VAG_DIR/start_nstackMain.sh $VAG_DIR/start_nstackMain_csit.sh -sed -i 's!.*check_hugepage.sh!#skip hugepage check!1' $VAG_DIR/start_nstackMain_csit.sh -sed -i 's!ifname=.*!ifname='$ifname'!1' $VAG_DIR/start_nstackMain_csit.sh -sudo LD_LIBRARY_PATH=${LIB_PATH} bash $VAG_DIR/start_nstackMain_csit.sh || exit 1 - -sleep 5 - -#after nstackmain -echo "after nstackmain" -ip addr -lspci -nn -lsmod | grep uio -cat /proc/meminfo | grep Huge -/tmp/dpdk/dpdk-18.02/usertools/dpdk-devbind.py --status - -cd ${APP_DIR} - -if [ ${proc_name} -eq 0 ]; then -sudo NSTACK_LOG_ON=DBG LD_LIBRARY_PATH=${LIB_PATH} ./vs_epoll -p 20000 -d ${dut2_if_ip} -a 10000 -s ${dut1_if_ip} -l 200 -t 50000 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 -else -sudo NSTACK_LOG_ON=DBG LD_LIBRARY_PATH=${LIB_PATH} ./vc_common -p 20000 -d ${dut1_if_ip} -a 10000 -s ${dut2_if_ip} -l 200 -t 50 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1 -fi - -cd $APP_DIR/../release/ -sudo ./stop_nstack.sh -exit 0 diff --git a/tests/dmm/dmm_scripts/setup_hugepage.sh b/tests/dmm/dmm_scripts/setup_hugepage.sh deleted file mode 100755 index be25709e01..0000000000 --- a/tests/dmm/dmm_scripts/setup_hugepage.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -x - -# check and setup the hugepages -SYS_HUGEPAGE=$(cat /sys/kernel/mm/hugepages/hugepages-2048kB/nr_hugepages) -hugepageFree=$(cat /sys/kernel/mm/hugepages/hugepages-2048kB/free_hugepages) - -if [ ${SYS_HUGEPAGE} -lt 1536 ] || [ $hugepageFree -eq 0 ]; then - MOUNT=$(mount | grep /mnt/nstackhuge) - count=$(mount | grep /mnt/nstackhuge | wc -l) - - while [ "${MOUNT}" != "" ] || [ "${count}" -ne 0 ] - do - sudo umount /mnt/nstackhuge - sleep 1 - MOUNT=$(mount | grep /mnt/nstackhuge) - count=$[$count -1] - done - - sock_count=$(lscpu | grep 'Socket(s):' | head -1 | awk '{print $2}') - ls -l /sys/devices/system/node/ - - while [ "${sock_count}" -ne 0 ] - do - sock_count=$[$sock_count - 1] - echo 1536 | sudo tee /sys/devices/system/node/node"$sock_count"/hugepages/hugepages-2048kB/nr_hugepages - done - - sudo mkdir -p /mnt/nstackhuge - sudo mount -t hugetlbfs -o pagesize=2M none /mnt/nstackhuge/ - test $? -eq 0 || exit 1 -else - sudo mkdir -p /mnt/nstackhuge - sudo mount -t hugetlbfs -o pagesize=2M none /mnt/nstackhuge/ -fi - -cat /proc/meminfo -exit 0 diff --git a/tests/dmm/func/SingleCliSer-func.robot b/tests/dmm/func/SingleCliSer-func.robot index 4cfa6a0259..939c2c42ad 100644 --- a/tests/dmm/func/SingleCliSer-func.robot +++ b/tests/dmm/func/SingleCliSer-func.robot @@ -28,35 +28,19 @@ | ... | here we test the 1. test the vs_epool and vc_epoll *** Variables *** -| ${ip4_net1_1}= | 172.28.128.3 -| ${ip4_net2_1}= | 172.28.128.4 -| ${ip4_prefix}= | 24 +| ${dut1_ip}= | 172.28.128.3 +| ${dut2_ip}= | 172.28.128.4 +| ${prefix_len}= | 24 *** Test Cases *** -| TC01: DMM base vs epoll test case +| TC01: DMM Single Client Server Test Case | | Given DMM Basic Test Setup -| | When Exec the base vs epoll test | ${dut1_node} | ${dut2_node} -| | ... | ${dut1_to_dut2_if_name} | ${dut2_to_dut1_if_name} -| | ... | ${ip4_net1_1} | ${ip4_net2_1} -| | Echo DMM logs | ${dut2_node} -| | ${no_packet_loss} = | Get the test result | ${dut2_node} -| | Then Should Not Be Equal As Integers | ${no_packet_loss} | 0 - -| TC02: DMM LWIP integration test case -| | Given DMM Basic Test Setup -| | When Exec the base lwip test | ${dut1_node} | ${dut2_node} -| | ... | ${dut1_to_dut2_if_name} | ${dut2_to_dut1_if_name} -| | ... | ${ip4_net1_1} | ${ip4_net2_1} -| | Echo running log | ${dut1_node} | ${dut2_node} -| | Echo dpdk log | ${dut1_node} | ${dut2_node} -| | ${no_packet_loss_lwip} = | Get lwip test result | ${dut2_node} -| | Then Should Not Be Equal As Integers | ${no_packet_loss_lwip} | 0 +| | ${total_count} | ${pass_count}= | When Run DMM Func Test Cases +| | ... | ${dut1_node} | ${dut2_node} | ${dut1_to_dut2_if_name} +| | ... | ${dut2_to_dut1_if_name} | ${dut1_ip} | ${dut2_ip} | ${prefix_len} +| | Then Should Be Equal As Integers | ${total_count} | ${pass_count} *** Keywords *** | DMM Basic Test Setup | | Path for 2-node testing is set | ${nodes['DUT1']} | ${nodes['DUT2']} | | Pick out the port used to execute test -| | Set DMM Interface Address | ${dut1_node} | -| | ... | ${dut1_to_dut2_if_name} | ${ip4_net1_1} | ${ip4_prefix} -| | Set DMM Interface Address | ${dut2_node} -| | ... | ${dut2_to_dut1_if_name} | ${ip4_net2_1} | ${ip4_prefix} -- cgit 1.2.3-korg