summaryrefslogtreecommitdiffstats
path: root/benchmarks/playbooks/result_transform/dpi
diff options
context:
space:
mode:
authorMofassir Arif <Mofassir_arif@dellteam.com>2015-12-16 02:25:51 -0800
committerMofassir Arif <Mofassir_arif@dellteam.com>2015-12-16 03:41:54 -0800
commit8c9207f71147e9e4b44f813793c5bf04f4eba381 (patch)
tree1682854be20c020443b1fa35ed39dace5d77f9b9 /benchmarks/playbooks/result_transform/dpi
parentae3870b6863604d39bd15b0212bcf2694076a034 (diff)
Removed Root previlages
QTIP now uses a key of its own to ssh into VMs The ssh for the baremetal servers still needs work Change-Id: I1aa37e07c4f9b3f7f4902d16cdbf74f39eb6c698 Signed-off-by: Mofassir Arif <Mofassir_arif@dellteam.com> Conflicts: .gitignore
Diffstat (limited to 'benchmarks/playbooks/result_transform/dpi')
-rw-r--r--benchmarks/playbooks/result_transform/dpi/dpi_transform.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/benchmarks/playbooks/result_transform/dpi/dpi_transform.py b/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
index 2aa45757..b95e0e23 100644
--- a/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
+++ b/benchmarks/playbooks/result_transform/dpi/dpi_transform.py
@@ -46,9 +46,4 @@ result = {}
result['DPI_benchmark(M pps)'] = round(dpi_result_pps, 3)
result['DPI_benchmark(Gb/s)'] = round(dpi_result_bps, 3)
with open('./result_temp', 'w+') as result_file:
- pickle.dump(result, result_file)
-<<<<<<< HEAD
-
-=======
-print json.dumps(result, indent=4, sort_keys=True)
->>>>>>> 5a7dcc0... Networking testcases for QTIP Framework
+ pickle.dump(result, result_file) \ No newline at end of file