Fixed issue with SSL and IPERF

Recent patches incorporating sudo led to an error

Change-Id: If0e3316fbebce774db43f5fdcb3ea5e322a28222
Signed-off-by: Nauman_Ahad <nauman_ahad@xflowresearch.com>
(cherry picked from commit c90360642e3032c73b7d17844eb6b019b618fc5b)

diff --git a/benchmarks/playbooks/iperf.yaml b/benchmarks/playbooks/iperf.yaml
index 773961f..9bd0f1e 100644 (file)
--- a/benchmarks/playbooks/iperf.yaml
+++ b/benchmarks/playbooks/iperf.yaml
@@ -75,20 +75,20 @@
       when: ansible_os_family == "RedHat"
 
     - name: Running iperf on server
-      shell: sudo iperf3 -s
+      shell: iperf3 -s
       async: 400
       poll: 0
       when: rolename == "1-server"
 
     - name: Running Iperf on Host
-      shell: sudo iperf3  --time {{duration}} -b {{bandwidthGbps}}G -c {{ip1}} -J -O10 >> ./qtip_result/iperf_raw.json
+      shell: iperf3  --time {{duration}} -b {{bandwidthGbps}}G -c {{ip1}} -J -O10 >> ./qtip_result/iperf_raw.json
       ignore_errors: yes
       with_items:
         - "{{ip1}}"
       when: rolename == "2-host" and "{{privateip1}}" == "NONE"
 
     - name: Running Iperf on Host
-      shell: sudo iperf3  --time {{duration}} -b{{bandwidthGbps}}G -c {{privateip1}} -J -O10 >> ./qtip_result/iperf_raw.json
+      shell: iperf3  --time {{duration}} -b{{bandwidthGbps}}G -c {{privateip1}} -J -O10 >> ./qtip_result/iperf_raw.json
       ignore_errors: yes
       with_items:
         - "{{ip1}}"

diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml
index 942fba5..4be9c1d 100644 (file)
--- a/benchmarks/playbooks/ssl.yaml
+++ b/benchmarks/playbooks/ssl.yaml
@@ -62,7 +62,7 @@
       copy: src=./result_transform/ssl/ssl_transform.py dest={{home_dir.stdout}}/qtip_result
 
     - name: Transforming result
-      shell: sudo cd $HOME/qtip_result  &&  python ssl_transform.py
+      shell: cd $HOME/qtip_result  &&  python ssl_transform.py
 
     - name: copy report formation script
       copy: src=./result_transform/final_report.py dest={{home_dir.stdout}}/qtip_result

diff --git a/data/ref_results/compute_benchmarks_indices.py b/data/ref_results/compute_benchmarks_indices.py
index 51f6c41..9aaff88 100644 (file)
--- a/data/ref_results/compute_benchmarks_indices.py
+++ b/data/ref_results/compute_benchmarks_indices.py
@@ -74,7 +74,7 @@ def ramspeed_index ():
     ramspeed_int_bm_index=get_index(ramspeed_dict, 'ramspeed_bm', ramspeed_int_bm_ref,'4  RamSpeed result','1. INTmem bandwidth','5. Average (MB/s)')
     
     ramspeed_float_bm_ref=get_reference('compute','ramspeed_bm','FLOATmem','Average (MB/s)')
-    ramspeed_float_bm_index=get_index(ramspeed_dict, 'ramspeed_bm', ramspeed_float_bm_ref,'4  RamSpeed result','1. FLOATmem bandwidth','5. Average (MB/s)')
+    ramspeed_float_bm_index=get_index(ramspeed_dict, 'ramspeed_bm', ramspeed_float_bm_ref,'4  RamSpeed result','2. FLOATmem bandwidth','5. Average (MB/s)')
     
     ramspeed_bm_index=(ramspeed_int_bm_index+ramspeed_float_bm_index)/2
     
@@ -82,7 +82,7 @@ def ramspeed_index ():
     ramspeed_int_vm_index=get_index(ramspeed_dict, 'ramspeed_vm', ramspeed_int_vm_ref,'4  RamSpeed result','1. INTmem bandwidth','5. Average (MB/s)')
     
     ramspeed_float_vm_ref=get_reference('compute','ramspeed_vm','FLOATmem','Average (MB/s)')
-    ramspeed_float_vm_index=get_index(ramspeed_dict, 'ramspeed_vm', ramspeed_float_vm_ref,'4  RamSpeed result','1. FLOATmem bandwidth','5. Average (MB/s)')
+    ramspeed_float_vm_index=get_index(ramspeed_dict, 'ramspeed_vm', ramspeed_float_vm_ref,'4  RamSpeed result','2. FLOATmem bandwidth','5. Average (MB/s)')
     
     ramspeed_vm_index=(ramspeed_int_vm_index+ramspeed_float_vm_index)/2
     

diff --git a/data/ref_results/generator_ref_json.py b/data/ref_results/generator_ref_json.py
index db39665..f5b8e12 100644 (file)
--- a/data/ref_results/generator_ref_json.py
+++ b/data/ref_results/generator_ref_json.py
@@ -8,10 +8,10 @@ dict_ref['compute']['dpi_vm']=22.12
 
 dict_ref['compute']['whetstone_bm']={};
 dict_ref['compute']['whetstone_vm']={};
-dict_ref['compute']['whetstone_bm']['single_cpu']=859.1
-dict_ref['compute']['whetstone_bm']['multi_cpu']=859.1
-dict_ref['compute']['whetstone_vm']['single_cpu']=859.1
-dict_ref['compute']['whetstone_vm']['multi_cpu']=859.
+dict_ref['compute']['whetstone_bm']['single_cpu']=806.1
+dict_ref['compute']['whetstone_bm']['multi_cpu']=41483.3
+dict_ref['compute']['whetstone_vm']['single_cpu']=789.0
+dict_ref['compute']['whetstone_vm']['multi_cpu']=2950.6
 
 dict_ref['compute']['dhrystone_bm']={};
 dict_ref['compute']['dhrystone_vm']={};
@@ -50,14 +50,14 @@ dict_ref['compute']['ssl_vm']['AES']['8192B']=807701160
 dict_ref['compute']['ramspeed_bm']={};
 dict_ref['compute']['ramspeed_bm']['INTmem']={};
 dict_ref['compute']['ramspeed_bm']['FLOATmem']={};
-dict_ref['compute']['ramspeed_bm']['INTmem']['Average (MB/s)']=11775.85
-dict_ref['compute']['ramspeed_bm']['FLOATmem']['Average (MB/s)']=9780.23
+dict_ref['compute']['ramspeed_bm']['INTmem']['Average (MB/s)']=12268.38
+dict_ref['compute']['ramspeed_bm']['FLOATmem']['Average (MB/s)']=9758.79
 
 dict_ref['compute']['ramspeed_vm']={};
 dict_ref['compute']['ramspeed_vm']['INTmem']={};
 dict_ref['compute']['ramspeed_vm']['FLOATmem']={};
-dict_ref['compute']['ramspeed_vm']['INTmem']['Average (MB/s)']=11775.85
-dict_ref['compute']['ramspeed_vm']['FLOATmem']['Average (MB/s)']=9780.23
+dict_ref['compute']['ramspeed_vm']['INTmem']['Average (MB/s)']=12147.59
+dict_ref['compute']['ramspeed_vm']['FLOATmem']['Average (MB/s)']=9064.09
 
 
 dict_ref['storage']={};

diff --git a/data/ref_results/reference.json b/data/ref_results/reference.json
index 4ea5390..cfcbfc3 100644 (file)
--- a/data/ref_results/reference.json
+++ b/data/ref_results/reference.json
@@ -12,18 +12,18 @@
         "dpi_vm": 22.12, 
         "ramspeed_bm": {
             "FLOATmem": {
-                "Average (MB/s)": 9780.23
+                "Average (MB/s)": 9758.79
             }, 
             "INTmem": {
-                "Average (MB/s)": 11775.85
+                "Average (MB/s)": 12268.38
             }
         }, 
         "ramspeed_vm": {
             "FLOATmem": {
-                "Average (MB/s)": 9780.23
+                "Average (MB/s)": 9064.09
             }, 
             "INTmem": {
-                "Average (MB/s)": 11775.85
+                "Average (MB/s)": 12147.59
             }
         }, 
         "ssl_bm": {
@@ -57,12 +57,12 @@
             }
         }, 
         "whetstone_bm": {
-            "multi_cpu": 859.1, 
-            "single_cpu": 859.1
+            "multi_cpu": 41483.3, 
+            "single_cpu": 806.1
         }, 
         "whetstone_vm": {
-            "multi_cpu": 859.0, 
-            "single_cpu": 859.1
+            "multi_cpu": 2950.6, 
+            "single_cpu": 789.0
         }
     }, 
     "network": {