diff options
Diffstat (limited to 'tools/pkt_gen/testcenter')
-rw-r--r-- | tools/pkt_gen/testcenter/testcenter-rfc2544-rest.py | 6 | ||||
-rw-r--r-- | tools/pkt_gen/testcenter/testcenter.py | 8 |
2 files changed, 12 insertions, 2 deletions
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 f01069e2..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: @@ -436,11 +438,13 @@ class TestCenter(trafficgen.ITrafficGenerator): if traffic['imix']['enabled']: if traffic['imix']['type'] == 'genome': genome = traffic['imix']['genome'] - args.append('--imix' + ' ' + genome) + args.append('--imix') + args.append(genome) if settings.getValue("TRAFFICGEN_STC_LIVE_RESULTS") == "True": args.append('--live_results') - args.append('--logfile' + ' ' + self._liveresults_file) + args.append('--logfile') + args.append(self._liveresults_file) if settings.getValue("TRAFFICGEN_STC_VERBOSE") == "True": args.append("--verbose") |