X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fdut_setup.sh;h=aee6386bd786ebfecfb7354ab92b6df244566d4f;hp=7069e5e608662c47fd390752de50bf91d0a904f5;hb=11be8edf29b2740825110d629a23ea0bbe8a50a8;hpb=8e37725ead0a812ae4474ffba4ef120fd5ca9662

diff --git a/resources/libraries/bash/dut_setup.sh b/resources/libraries/bash/dut_setup.sh
old mode 100644
new mode 100755
index 7069e5e608..aee6386bd7
--- 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:
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 function cmd {
-    echo
     echo "[Command_start_exec] '$1'"
     echo -n "[Command_outputs] "
     eval ${@}
@@ -24,17 +23,23 @@ function cmd {
 echo
 echo "[Command_desc] Starting ${0}"
 
-cmd 'dpkg -l vpp\*'
+if [ -f "/etc/redhat-release" ]; then
+    cmd 'rpm -qai vpp*'
+else
+    cmd 'dpkg -l 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'
 
+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'
@@ -45,8 +50,11 @@ cmd 'sudo dmidecode | grep UUID'
 
 cmd 'lspci -Dnn'
 
-cmd 'tail -n 50 /var/log/syslog'
-
 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 50"'
 
+echo "[Command_desc] Adding memif-input trace"
+cmd 'sudo vpp_api_test <<< "exec trace add memif-input 50"'