X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=yardstick%2Fbenchmark%2Fcore%2Ftask.py;h=87d70f42f9537905c621f508fa266dba23c5b21e;hb=0c99c83ffaa58757dd8d9c0bb3adef783f5cb037;hp=d05117b4748f083f50d7cfddd038a88c0371d708;hpb=fa3afbcac13e1aa3ae9cc2977dcb4cd882112f6f;p=yardstick.git diff --git a/yardstick/benchmark/core/task.py b/yardstick/benchmark/core/task.py index d05117b47..87d70f42f 100644 --- a/yardstick/benchmark/core/task.py +++ b/yardstick/benchmark/core/task.py @@ -66,8 +66,6 @@ class Task(object): # pragma: no cover if args.parse_only: sys.exit(0) - if os.path.isfile(args.output_file): - os.remove(args.output_file) # parse task_files for i in range(0, len(task_files)): one_task_start_time = time.time() @@ -195,6 +193,8 @@ class TaskParser(object): # pragma: no cover LOG.info("\nStarting scenario:%s", cfg["name"]) test_cases_dir = cfg.get("test_cases_dir", test_cases_dir_default) + test_cases_dir = os.path.join(constants.YARDSTICK_ROOT_PATH, + test_cases_dir) if test_cases_dir[-1] != os.sep: test_cases_dir += os.sep @@ -294,7 +294,8 @@ class TaskParser(object): # pragma: no cover change_server_name(scenario, name_suffix) try: - change_server_name(scenario['nodes'], name_suffix) + for node in scenario['nodes']: + scenario['nodes'][node] += name_suffix except KeyError: pass