diff options
| author |   Sridhar Rao <sridhar.rao@spirent.com> | 2020-12-01 11:49:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-12-01 11:49:12 +0000 |
| commit | 90ef48d4342a983c7733b8c21bb902d1dab2685a (patch) | |
| tree | 9496de569be5cac8445106174b4e47b171c9b9b0 /tools | |
| parent | 249ac8fcbb138c0aee22234aa6738083c62ad23d (diff) | |
| parent | d7a033d9e40eedee5e0413cb2f0898fc82364f58 (diff) | |
Merge "Tools: Improve Stability."HEADopnfv-10.0.0stable/jermamaster
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker/results/notebooks/testresult-analysis.ipynb | 1 | ||||
| -rw-r--r-- | tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py | 6 | ||||
| -rw-r--r-- | tools/pkt_gen/testcenter/testcenter.py | 2 |
3 files changed, 8 insertions, 1 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: |