X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fdut_setup.sh;h=aee6386bd786ebfecfb7354ab92b6df244566d4f;hb=cebbe0a29e2c6329c54d09a77a64e874703c7d4f;hp=077fdcc8c995ecde7a1ce1b3be2fde3f02c4761e;hpb=8f285166faf13156a4f7c70adac9a7e20549268f;p=csit.git

diff --git a/resources/libraries/bash/dut_setup.sh b/resources/libraries/bash/dut_setup.sh
index 077fdcc8c9..aee6386bd7 100644
--- a/resources/libraries/bash/dut_setup.sh
+++ b/resources/libraries/bash/dut_setup.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -12,33 +12,49 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo
-echo Restart VPP
-echo
-sudo -S service vpp restart
+function cmd {
+    echo "[Command_start_exec] '$1'"
+    echo -n "[Command_outputs] "
+    eval ${@}
+    echo "[Command_done_exec] '$1'"
+    echo
+}
 
 echo
-echo List vpp packages
-echo
-dpkg -l vpp\*
+echo "[Command_desc] Starting ${0}"
 
-echo
-echo List /proc/meminfo
-echo
-cat /proc/meminfo
+if [ -f "/etc/redhat-release" ]; then
+    cmd 'rpm -qai vpp*'
+else
+    cmd 'dpkg -l vpp\*'
+fi
 
-echo
-echo See vpp process
-echo
-ps aux | grep vpp
+cmd 'ps aux | grep vpp'
 
-echo
-echo See free memory
-echo
-free -m
+cmd 'cat /etc/vpp/startup.conf'
+
+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'
+
+cmd "sudo journalctl --no-pager --unit=vpp --since=\"$(echo `systemctl show -p ActiveEnterTimestamp vpp` | awk '{print $2 $3}')\""
+
+cmd 'cat /proc/meminfo'
+
+cmd 'free -m'
+
+cmd 'ps aux | grep vpp'
+
+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 50"'
 
-echo UUID
-sudo dmidecode | grep UUID
+echo "[Command_desc] Adding vhost-user-input trace"
+cmd 'sudo vpp_api_test <<< "exec trace add vhost-user-input 50"'
 
-echo Add dpdk-input trace
-sudo vpp_api_test <<< "exec trace add dpdk-input 100"
+echo "[Command_desc] Adding memif-input trace"
+cmd 'sudo vpp_api_test <<< "exec trace add memif-input 50"'