1 files changed, 8 insertions, 34 deletions
diff --git a/scripts/csit/run/run_dmm_with_lwip.sh b/scripts/csit/run/run_dmm_with_lwip.sh
index 1174697..3b02e28 100755
--- a/scripts/csit/run/run_dmm_with_lwip.sh
+++ b/scripts/csit/run/run_dmm_with_lwip.sh
@@ -22,39 +22,22 @@ APP_DIR=${ROOTDIR}/dmm/stacks/lwip_stack/app_test/
 LIB_PATH=${APP_DIR}/../release/lib64/
 VAG_DIR=${ROOTDIR}/dmm/stacks/lwip_stack/vagrant
 LOG_PATH=/var/log/nStack
+DMM_SCRIPT_DIR=$ROOTDIR/dmm/scripts
 
+source $DMM_SCRIPT_DIR/csit/common.sh
 #################################################
 # Setup preparation
 
 if [ "x$action" == "xsetup" ]; then
-  bash $CSIT_SCRIPT_DIR/kill_given_proc.sh vs_epoll
-  bash $CSIT_SCRIPT_DIR/setup_hugepage.sh
-  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
+  setup_preparation_lwip vs_epoll
 fi
 
 #################################################
 # Execution
 
 if [ "x$action" == "xrun" ]; then
-  cd ${APP_DIR}
-  if [ "x$node" == "x0" ]; 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 50 -i 0 -f 1 -r 20000 -n 1 -w 10 -u 10000 -e 10 -x 1
-  fi
+  execution "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" \
+    "sudo 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
 
 #################################################
@@ -62,14 +45,9 @@ fi
 
 if [ "x$action" == "xverify" ]; then
   if [ "x$node" == "x1" ]; then
-    cat $RUN_DIR/log_$(basename $0).txt | grep "send 50"
-    if [ $? == 0 ]; then
-      echo "DMM_CSIT_TEST_PASSED"
-    else
-      echo "DMM_CSIT_TEST_FAILED"
-    fi
+    verification "cat $RUN_DIR/log_$(basename $0).txt | grep \"send 50\""
   elif [ "x$node" == "x0" ]; then
-    echo "DMM_CSIT_TEST_PASSED"
+    verification
   fi
 fi
 
@@ -84,11 +62,7 @@ fi
 # Cleanup
 
 if [ "x$action" == "xcleanup"  ]; then
-  if [ "x$node" == "x0" ]; then
-    bash $CSIT_SCRIPT_DIR/kill_given_proc.sh vs_epoll
-  fi
-  sudo bash $APP_DIR/../release/stop_nstack.sh
-  sudo rm $LOG_PATH/running.log
+  cleanup_lwip vs_epoll
 fi
 
 exit 0