Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding generic traffic profiles for trex traffic generator"
[yardstick.git]
/
yardstick
/
benchmark
/
core
/
task.py
diff --git
a/yardstick/benchmark/core/task.py
b/yardstick/benchmark/core/task.py
index
d05117b
..
87d70f4
100644
(file)
--- 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 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()
# 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)
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
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, name_suffix)
try:
- change_server_name(scenario['nodes'], name_suffix)
+ for node in scenario['nodes']:
+ scenario['nodes'][node] += name_suffix
except KeyError:
pass
except KeyError:
pass