Report: Remove Denverton

[csit.git] / resources / libraries / bash / dut_setup.sh

diff --git a/resources/libraries/bash/dut_setup.sh b/resources/libraries/bash/dut_setup.sh
old mode 100644 (file)
new mode 100755 (executable)
index 28b495c..d0b2fab
--- 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'