X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fdut_setup.sh;h=d0b2fabd8e0f614e7d587a10c33caec5c1892a58;hp=988ffe1ce2e8eb2e0ee721565ae5626febabe416;hb=e0db487320596ce7fbdd29bd121969878297e12a;hpb=68dfcca79ee6838a266330eba834b360b11a3c15

diff --git a/resources/libraries/bash/dut_setup.sh b/resources/libraries/bash/dut_setup.sh
old mode 100644
new mode 100755
index 988ffe1ce2..d0b2fabd8e
--- a/resources/libraries/bash/dut_setup.sh
+++ b/resources/libraries/bash/dut_setup.sh
@@ -24,16 +24,16 @@ echo
 echo "[Command_desc] Starting ${0}"
 
 if [ -f "/etc/redhat-release" ]; then
-    cmd 'rpm -qai vpp*'
+    cmd 'rpm -qai *vpp*'
 else
-    cmd 'dpkg -l vpp\*'
+    cmd 'dpkg -l | grep vpp'
 fi
 
 cmd 'ps aux | grep vpp'
 
 cmd 'cat /etc/vpp/startup.conf'
 
-cmd 'sudo -S service vpp restart'
+cmd 'if fgrep docker /proc/1/cgroup; then supervisorctl restart vpp; else sudo -S service vpp restart; fi'
 
 echo "[Command_desc] SLEEP for three seconds, so that VPP is up for sure"
 cmd 'sleep 3'
@@ -51,7 +51,10 @@ cmd 'sudo dmidecode | grep UUID'
 cmd 'lspci -Dnn'
 
 echo "[Command_desc] Adding dpdk-input trace"
-cmd 'sudo vpp_api_test <<< "exec trace add dpdk-input 100"'
+cmd 'sudo vpp_api_test <<< "exec trace add dpdk-input 50"'
 
 echo "[Command_desc] Adding vhost-user-input trace"
-cmd 'sudo vpp_api_test <<< "exec trace add vhost-user-input 100"'
+cmd 'sudo vpp_api_test <<< "exec trace add vhost-user-input 50"'
+
+echo "[Command_desc] Adding memif-input trace"
+cmd 'sudo vpp_api_test <<< "exec trace add memif-input 50"'