Fix the TLDK test tcpdump not found issue.

	Add the PYBOT execute exit status code.

Change-Id: If0fc29c580177f1b187ec751c6708fc138838bed
Signed-off-by: Fangyin Hu <fangyinx.hu@intel.com>

diff --git a/bootstrap-TLDK.sh b/bootstrap-TLDK.sh
index 4678bf5..4f731cd 100755 (executable)
--- a/bootstrap-TLDK.sh
+++ b/bootstrap-TLDK.sh
@@ -17,6 +17,8 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PYTHONPATH=${SCRIPT_DIR}
 
@@ -199,3 +201,13 @@ PYTHONPATH=`pwd` pybot -L TRACE -W 150 \
     --include vm_envAND3_node_single_link_topo \
     --noncritical EXPECTED_FAILING \
     tests/
+
+RETURN_STATUS=$(echo $?)
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+    cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done
+
+exit ${RETURN_STATUS}

diff --git a/resources/libraries/python/TLDK/UdpTest.py b/resources/libraries/python/TLDK/UdpTest.py
index adc8aa0..0571323 100644 (file)
--- a/resources/libraries/python/TLDK/UdpTest.py
+++ b/resources/libraries/python/TLDK/UdpTest.py
@@ -114,8 +114,8 @@ class UdpTest(object):
         """
         ssh = SSH()
         ssh.connect(dut_node)
-        cmd = 'cd {0}; tcpdump -nnnn -vvv -r ./{2}/{1}_tx.pcap | ' \
-            'grep \'udp sum ok\' | wc -l' \
+        cmd = 'cd {0}; sudo /usr/sbin/tcpdump -nnnn -vvv -r ./{2}/{1}_tx.pcap' \
+              ' | grep \'udp sum ok\' | wc -l' \
             .format(con.REMOTE_FW_DIR, file_prefix, con.TLDK_TESTCONFIG)
 
         (ret_code, stdout, _) = ssh.exec_command(cmd, timeout=100)