X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Fdut_setup.sh;h=952b82bdc7a23509cb4e54f39004c74fdcf40492;hb=c293eae53515f7b94ac5a71b329a9a9655bd8c09;hp=c6bd0fbbe2fa0850337273d961490d75a07619ee;hpb=05eba892c7d2a778e78a950966fb1a6e0d68aa60;p=csit.git

diff --git a/resources/libraries/bash/dut_setup.sh b/resources/libraries/bash/dut_setup.sh
index c6bd0fbbe2..952b82bdc7 100644
--- a/resources/libraries/bash/dut_setup.sh
+++ b/resources/libraries/bash/dut_setup.sh
@@ -12,50 +12,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-echo
-echo List vpp packages
-echo
-dpkg -l vpp\*
+function cmd {
+    echo "[Command_start_exec] '$1'"
+    echo -n "[Command_outputs] "
+    eval ${@}
+    echo "[Command_done_exec] '$1'"
+    echo
+}
 
 echo
-echo See vpp process
-echo
-ps aux | grep vpp
+echo "[Command_desc] Starting ${0}"
 
-echo
-echo See /etc/vpp/startup.conf
-echo
-cat /etc/vpp/startup.conf
+if [ -f "/etc/redhat-release" ]; then
+    cmd 'rpm -qai vpp*'
+else
+    cmd 'dpkg -l vpp\*'
+fi
 
-echo
-echo Restart VPP
-echo
-sudo -S service vpp restart
+cmd 'ps aux | grep vpp'
 
-echo
-echo List /proc/meminfo
-echo
-cat /proc/meminfo
+cmd 'cat /etc/vpp/startup.conf'
 
-echo
-echo See free memory
-echo
-free -m
+cmd 'sudo -S service vpp restart'
 
-echo
-echo See vpp process
-echo
-ps aux | grep vpp
-
-echo UUID
-sudo dmidecode | grep UUID
-
-echo Add dpdk-input trace
-sudo vpp_api_test <<< "exec trace add dpdk-input 100"
-RESULT=$?
-if [ $RESULT -ne 0 ]; then
-  echo
-  echo See /var/log/syslog
-  sudo tail -n 200 /var/log/syslog
-  exit $RESULT
+echo "[Command_desc] SLEEP for three seconds, so that VPP is up for sure"
+cmd 'sleep 3'
+
+cmd 'cat /proc/meminfo'
+
+cmd 'free -m'
+
+cmd 'ps aux | grep vpp'
+
+cmd 'sudo dmidecode | grep UUID'
+
+cmd 'lspci -Dnn'
+
+if [ -f "/etc/redhat-release" ]; then
+    cmd 'tail -n 100 /var/log/messages'
+else
+    cmd 'tail -n 100 /var/log/syslog'
 fi
+
+echo "[Command_desc] Adding dpdk-input trace"
+cmd 'sudo vpp_api_test <<< "exec trace add dpdk-input 100"'
+
+echo "[Command_desc] Adding vhost-user-input trace"
+cmd 'sudo vpp_api_test <<< "exec trace add vhost-user-input 100"'
\ No newline at end of file