Fix OpenStack CLI Get List error

[integration/test.git] / tools / mdsal_benchmark / dsbenchmark.py

diff --git a/tools/mdsal_benchmark/dsbenchmark.py b/tools/mdsal_benchmark/dsbenchmark.py
index 7dc00f7bcf1404ba5dec0bb07111eaf84d80315e..15d6607f3903b8ca99cbd1451d1bdf7bb28a3ef6 100755 (executable)
--- a/tools/mdsal_benchmark/dsbenchmark.py
+++ b/tools/mdsal_benchmark/dsbenchmark.py
@@ -46,6 +46,10 @@ parser.add_argument("--plot", type=str, default='none',
                     help="keywords filter for results to be drawn in plot (special keywords: all, none).")
 parser.add_argument("--units", choices=["miliseconds", "microseconds"], default="microseconds",
                     help="units of test duration values provided by dsbenchmark controller feature")
+parser.add_argument("--outfile-struct", dest="outfilestruct", default="perf_per_struct.csv",
+                    help="units of test duration values provided by dsbenchmark controller feature")
+parser.add_argument("--outfile-ops", dest="outfileops", default="perf_per_ops.csv",
+                    help="units of test duration values provided by dsbenchmark controller feature")
 args = parser.parse_args()
 
 
@@ -184,10 +188,10 @@ def write_results_to_file(values, file_name, key_filter):
     try:
         for key in sorted(values):
             if (key_filter != 'none') & ((key_filter == 'all') | (re.search(key_filter, key) is not None)):
-                first_line += key + ', '
-                second_line += str(values[key]) + ', '
-        first_line = first_line[:-2]
-        second_line = second_line[:-2]
+                first_line += key + ','
+                second_line += str(values[key]) + ','
+        first_line = first_line[:-1]
+        second_line = second_line[:-1]
         f.write(first_line + '\n')
         f.write(second_line + '\n')
     finally:
@@ -303,8 +307,8 @@ if __name__ == "__main__":
                             store_result(PLOT2, tx_type, oper, fmt, datastore, TOTAL_ELEMENTS / elem, 1, wtx,
                                          'EXEC', avg_exec_time / TIME_DIV)
 
-        write_results_to_file(PLOT1, 'perf_per_struct.csv', PLOT_FILTER)
-        write_results_to_file(PLOT2, 'perf_per_ops.csv', PLOT_FILTER)
+        write_results_to_file(PLOT1, args.outfilestruct, PLOT_FILTER)
+        write_results_to_file(PLOT2, args.outfileops, PLOT_FILTER)
 
         end_time = time.time()
         print "End time: %f " % end_time