From d7a033d9e40eedee5e0413cb2f0898fc82364f58 Mon Sep 17 00:00:00 2001
From: opensource-tnbt <sridhar.rao@spirent.com>
Date: Tue, 1 Dec 2020 16:46:31 +0530
Subject: Tools: Improve Stability.

This patch has minor updates to improve stability.

Signed-off-by: Sridhar K. N. Rao <sridhar.rao@spirent.com>
Change-Id: I0ded30c64389d75f15d2a8758a40dfb5cf3ff674
---
 tools/docker/results/notebooks/testresult-analysis.ipynb | 1 -
 tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py      | 6 ++++++
 tools/pkt_gen/testcenter/testcenter.py                   | 2 ++
 xtesting/openstack/vsperfostack.py                       | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/docker/results/notebooks/testresult-analysis.ipynb b/tools/docker/results/notebooks/testresult-analysis.ipynb
index 4f12ed63..6ce58dd8 100644
--- a/tools/docker/results/notebooks/testresult-analysis.ipynb
+++ b/tools/docker/results/notebooks/testresult-analysis.ipynb
@@ -187,7 +187,6 @@
     "            value = value.lstrip()\n",
     "            guest_cores = value[1:-2]\n",
     "            print(guest_cores)"
-    "\n",
    ]
   },
   {
diff --git a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
index 2f0cb0b4..8089ef42 100644
--- a/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
+++ b/tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py
@@ -691,6 +691,11 @@ def main():
         lab_server_resultsdb = stc.get(
             "system1.project.TestResultSetting", "CurrentResultFileName")
 
+        if not lab_server_resultsdb or 'Results' not in lab_server_resultsdb:
+            _LOGGER.info("Failed to find results.")
+            stc.end_session()
+            return
+
         if args.verbose:
             _LOGGER.debug("The lab server results database is %s",
                           lab_server_resultsdb)
@@ -811,6 +816,7 @@ def main():
             args.results_dir, args.csv_results_file_prefix, resultsdict)
 
     except RuntimeError as e:
+        stc.end_session()
         _LOGGER.error(e)
 
     if args.verbose:
diff --git a/tools/pkt_gen/testcenter/testcenter.py b/tools/pkt_gen/testcenter/testcenter.py
index 73967bae..a15c502c 100644
--- a/tools/pkt_gen/testcenter/testcenter.py
+++ b/tools/pkt_gen/testcenter/testcenter.py
@@ -338,6 +338,8 @@ class TestCenter(trafficgen.ITrafficGenerator):
         Reads the CSV file and return the results
         """
         result = {}
+        if not os.path.exists(filename):
+            return result
         with open(filename, "r") as csvfile:
             csvreader = csv.DictReader(csvfile)
             for row in csvreader:
diff --git a/xtesting/openstack/vsperfostack.py b/xtesting/openstack/vsperfostack.py
index d4a14c06..437f8492 100755
--- a/xtesting/openstack/vsperfostack.py
+++ b/xtesting/openstack/vsperfostack.py
@@ -73,7 +73,7 @@ class VsperfOstack(testcase.TestCase):
                                                   conffile,
                                                   '--load-env',
                                                   '--mode',
-                                                  'traffigen',
+                                                  'trafficgen',
                                                   '--tests',
                                                   self.case_name])
             print(output)
-- 
cgit 1.2.3-korg