From: Peter Mikus <pmikus@cisco.com>
Date: Fri, 5 Jan 2018 08:45:07 +0000 (+0000)
Subject: VatHistory: Add ability to trace file executions
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=b5fe0fd9a4266773125cc4d4c1edaa1c1a8a1731

VatHistory: Add ability to trace file executions

Change-Id: I9f6de8d2b86ddbbdf1524dcc12d8ed5a33b3266e
Signed-off-by: Peter Mikus <pmikus@cisco.com>
---

diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh
index e2d37e2d8c..4b86c6ea37 100755
--- a/bootstrap-verify-perf.sh
+++ b/bootstrap-verify-perf.sh
@@ -244,6 +244,7 @@ case "$TEST_TAG" in
               --include pdrdiscANDnic_intel-xl710AND1t1cANDipsechwANDbase \
               --include pdrdiscANDnic_intel-xl710AND2t2cANDipsechwANDbase \
               tests/
+        RETURN_STATUS=$(echo $?)
         ;;
     VPP-VERIFY-PERF-IP4 )
         pybot ${PYBOT_ARGS} \
diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index febfe9fa57..de6baababe 100644
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -152,6 +152,9 @@ class VatExecutor(object):
             vat=Constants.VAT_BIN_NAME,
             input=vat_name)
 
+        with open(vat_name, 'r') as tmp_f:
+            VatHistory.add_to_vat_history(node, tmp_f.read())
+
         try:
             (ret_code, stdout, stderr) = ssh.exec_command(cmd, timeout)
         except SSHTimeout:
@@ -197,6 +200,10 @@ class VatExecutor(object):
                                     vat=Constants.VAT_BIN_NAME)
         cmd_input = "exec exec {0}".format(fname)
 
+        VatHistory.add_to_vat_history(node, cmd_input)
+        with open(fname, 'r') as tmp_f:
+            VatHistory.add_to_vat_history(node, tmp_f.read())
+
         try:
             (ret_code, stdout, stderr) = ssh.exec_command_sudo(cmd, cmd_input,
                                                                timeout)