Merge "Change result keys to lower-case and remove ' .'"

7 files changed, 60 insertions, 61 deletions

diff --git a/data/ref_results/compute_benchmarks_indices.py b/data/ref_results/compute_benchmarks_indices.py
index e46b8771..400d54ac 100644
--- a/data/ref_results/compute_benchmarks_indices.py
+++ b/data/ref_results/compute_benchmarks_indices.py
@@ -6,15 +6,15 @@ from result_accum import result_concat as concat
 def dpi_index():
     dpi_dict = concat('../../results/dpi/')
     dpi_bm_ref = get_reference('compute', 'dpi_bm')
-    dpi_bm_index = get_index(dpi_dict, 'dpi_bm', dpi_bm_ref, '4  DPI result', 'DPI_benchmark(Gb/s)')
+    dpi_bm_index = get_index(dpi_dict, 'dpi_bm', dpi_bm_ref, 'details', 'bps')
 
     dpi_vm_ref = get_reference('compute', 'dpi_vm')
-    dpi_vm_index = get_index(dpi_dict, 'dpi_vm', dpi_vm_ref, '4  DPI result', 'DPI_benchmark(Gb/s)')
+    dpi_vm_index = get_index(dpi_dict, 'dpi_vm', dpi_vm_ref, 'details', 'bps')
 
     dpi_index = (dpi_bm_index + dpi_vm_index) / 2
     dpi_dict_i = {}
-    dpi_dict_i['1. Index'] = dpi_index
-    dpi_dict_i['2. Results'] = dpi_dict
+    dpi_dict_i['index'] = dpi_index
+    dpi_dict_i['results'] = dpi_dict
     return dpi_dict_i
 
 
@@ -22,25 +22,25 @@ def dhrystone_index():
 
     dhrystone_dict = concat('../../results/dhrystone/')
     dhrystone_single_bm_ref = get_reference('compute', 'dhrystone_bm', 'single_cpu')
-    dhrystone_single_bm_index = get_index(dhrystone_dict, 'dhrystone_bm', dhrystone_single_bm_ref, '4  Dhrystone result', '2.Single CPU test', '2.Index score')
+    dhrystone_single_bm_index = get_index(dhrystone_dict, 'dhrystone_bm', dhrystone_single_bm_ref, 'details', 'single', 'score')
 
     dhrystone_multi_bm_ref = get_reference('compute', 'dhrystone_bm', 'multi_cpu')
-    dhrystone_multi_bm_index = get_index(dhrystone_dict, 'dhrystone_bm', dhrystone_multi_bm_ref, '4  Dhrystone result', '3.Multi CPU test', '2.Index score')
+    dhrystone_multi_bm_index = get_index(dhrystone_dict, 'dhrystone_bm', dhrystone_multi_bm_ref, 'details', 'multi', 'score')
 
     dhrystone_bm_index = (dhrystone_single_bm_index + dhrystone_multi_bm_index) / 2
 
     dhrystone_single_vm_ref = get_reference('compute', 'dhrystone_vm', 'single_cpu')
-    dhrystone_single_vm_index = get_index(dhrystone_dict, 'dhrystone_vm', dhrystone_single_vm_ref, '4  Dhrystone result', '2.Single CPU test', '2.Index score')
+    dhrystone_single_vm_index = get_index(dhrystone_dict, 'dhrystone_vm', dhrystone_single_vm_ref, 'details', 'single', 'score')
 
     dhrystone_multi_vm_ref = get_reference('compute', 'dhrystone_vm', 'multi_cpu')
-    dhrystone_multi_vm_index = get_index(dhrystone_dict, 'dhrystone_vm', dhrystone_multi_vm_ref, '4  Dhrystone result', '3.Multi CPU test', '2.Index score')
+    dhrystone_multi_vm_index = get_index(dhrystone_dict, 'dhrystone_vm', dhrystone_multi_vm_ref, 'details', 'multi', 'score')
 
     dhrystone_vm_index = (dhrystone_single_vm_index + dhrystone_multi_vm_index) / 2
 
     dhrystone_index = (dhrystone_bm_index + dhrystone_vm_index) / 2
     dhrystone_dict_i = {}
-    dhrystone_dict_i['1. Index'] = dhrystone_index
-    dhrystone_dict_i['2. Results'] = dhrystone_dict
+    dhrystone_dict_i['index'] = dhrystone_index
+    dhrystone_dict_i['results'] = dhrystone_dict
     return dhrystone_dict_i
 
 
@@ -48,25 +48,25 @@ def whetstone_index():
 
     whetstone_dict = concat('../../results/whetstone/')
     whetstone_single_bm_ref = get_reference('compute', 'whetstone_bm', 'single_cpu')
-    whetstone_single_bm_index = get_index(whetstone_dict, 'whetstone_bm', whetstone_single_bm_ref, '4  Whetstone result', '2.Single CPU test', '2.Index score')
+    whetstone_single_bm_index = get_index(whetstone_dict, 'whetstone_bm', whetstone_single_bm_ref, 'details', 'single', 'score')
 
     whetstone_multi_bm_ref = get_reference('compute', 'whetstone_bm', 'multi_cpu')
-    whetstone_multi_bm_index = get_index(whetstone_dict, 'whetstone_bm', whetstone_multi_bm_ref, '4  Whetstone result', '3.Multi CPU test', '2.Index score')
+    whetstone_multi_bm_index = get_index(whetstone_dict, 'whetstone_bm', whetstone_multi_bm_ref, 'details', 'multi', 'score')
 
     whetstone_bm_index = (whetstone_single_bm_index + whetstone_multi_bm_index) / 2
 
     whetstone_single_vm_ref = get_reference('compute', 'whetstone_vm', 'single_cpu')
-    whetstone_single_vm_index = get_index(whetstone_dict, 'whetstone_vm', whetstone_single_vm_ref, '4  Whetstone result', '2.Single CPU test', '2.Index score')
+    whetstone_single_vm_index = get_index(whetstone_dict, 'whetstone_vm', whetstone_single_vm_ref, 'details', 'single', 'score')
 
     whetstone_multi_vm_ref = get_reference('compute', 'whetstone_vm', 'multi_cpu')
-    whetstone_multi_vm_index = get_index(whetstone_dict, 'whetstone_vm', whetstone_multi_vm_ref, '4  Whetstone result', '3.Multi CPU test', '2.Index score')
+    whetstone_multi_vm_index = get_index(whetstone_dict, 'whetstone_vm', whetstone_multi_vm_ref, 'details', 'multi', 'score')
 
     whetstone_vm_index = (whetstone_single_vm_index + whetstone_multi_vm_index) / 2
 
     whetstone_index = (whetstone_bm_index + whetstone_vm_index) / 2
     whetstone_dict_i = {}
-    whetstone_dict_i['1. Index'] = whetstone_index
-    whetstone_dict_i['2. Results'] = whetstone_dict
+    whetstone_dict_i['index'] = whetstone_index
+    whetstone_dict_i['results'] = whetstone_dict
     return whetstone_dict_i
 
 
@@ -74,26 +74,26 @@ def ramspeed_index():
 
     ramspeed_dict = concat('../../results/ramspeed/')
     ramspeed_int_bm_ref = get_reference('compute', 'ramspeed_bm', 'INTmem', 'Average (MB/s)')
-    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_int_bm_index = get_index(ramspeed_dict, 'ramspeed_bm', ramspeed_int_bm_ref, 'details', 'int_bandwidth', 'average')
 
     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', '2. FLOATmem bandwidth', '5. Average (MB/s)')
+    ramspeed_float_bm_index = get_index(ramspeed_dict, 'ramspeed_bm', ramspeed_float_bm_ref, 'details', 'float_bandwidth', 'average')
 
     ramspeed_bm_index = (ramspeed_int_bm_index + ramspeed_float_bm_index) / 2
 
     ramspeed_int_vm_ref = get_reference('compute', 'ramspeed_vm', 'INTmem', 'Average (MB/s)')
-    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_int_vm_index = get_index(ramspeed_dict, 'ramspeed_vm', ramspeed_int_vm_ref, 'details', 'int_bandwidth', 'average')
 
     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', '2. FLOATmem bandwidth', '5. Average (MB/s)')
+    ramspeed_float_vm_index = get_index(ramspeed_dict, 'ramspeed_vm', ramspeed_float_vm_ref, 'details', 'float_bandwidth', 'average')
 
     ramspeed_vm_index = (ramspeed_int_vm_index + ramspeed_float_vm_index) / 2
 
     ramspeed_index = (ramspeed_vm_index + ramspeed_bm_index) / 2
 
     ramspeed_dict_i = {}
-    ramspeed_dict_i['1. Index'] = ramspeed_index
-    ramspeed_dict_i['2. Results'] = ramspeed_dict
+    ramspeed_dict_i['index'] = ramspeed_index
+    ramspeed_dict_i['results'] = ramspeed_dict
     return ramspeed_dict_i
 
 
@@ -112,17 +112,17 @@ def ssl_index():
     ssl_AES1024B_bm_ref = get_reference('compute', 'ssl_bm', 'AES', '1024B')
     ssl_AES8192B_bm_ref = get_reference('compute', 'ssl_bm', 'AES', '8192B')
 
-    ssl_RSA512b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA512b_bm_ref, '4  SSL result', '2. RSA signatures', '1. 512 bits (sign/s)')
-    ssl_RSA1024b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA1024b_bm_ref, '4  SSL result', '2. RSA signatures', '2. 1024 bits (sign/s)')
-    ssl_RSA2048b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA2048b_bm_ref, '4  SSL result', '2. RSA signatures', '3. 2048 bits (sign/s)')
-    ssl_RSA4096b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA4096b_bm_ref, '4  SSL result', '2. RSA signatures', '4. 4096 bits (sign/s)')
+    ssl_RSA512b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA512b_bm_ref, 'details', 'rsa_sig', '512_bits')
+    ssl_RSA1024b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA1024b_bm_ref, 'details', 'rsa_sig', '1024_bits')
+    ssl_RSA2048b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA2048b_bm_ref, 'details', 'rsa_sig', '2048_bits')
+    ssl_RSA4096b_bm_index = get_index(ssl_dict, "ssl_bm", ssl_RSA4096b_bm_ref, 'details', 'rsa_sig', '4096_bits')
     ssl_RSA_bm_index = (ssl_RSA512b_bm_index + ssl_RSA1024b_bm_index + ssl_RSA2048b_bm_index + ssl_RSA4096b_bm_index) / 4
 
-    ssl_AES16B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES16B_bm_ref, '4  SSL result', '3. AES-128-cbc throughput', '1. 16 Bytes block (B/sec)')
-    ssl_AES64B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES64B_bm_ref, '4  SSL result', '3. AES-128-cbc throughput', '2. 64 Bytes block (B/sec)')
-    ssl_AES256B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES256B_bm_ref, '4  SSL result', '3. AES-128-cbc throughput', '3. 256 Bytes block (B/sec)')
-    ssl_AES1024B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES1024B_bm_ref, '4  SSL result', '3. AES-128-cbc throughput', '4. 1024 Bytes block (B/sec)')
-    ssl_AES8192B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES8192B_bm_ref, '4  SSL result', '3. AES-128-cbc throughput', '5. 8192 Bytes block (B/sec)')
+    ssl_AES16B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES16B_bm_ref, 'details', 'aes_128_cbc', '16_block')
+    ssl_AES64B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES64B_bm_ref, 'details', 'aes_128_cbc', '64_block')
+    ssl_AES256B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES256B_bm_ref, 'details', 'aes_128_cbc', '256_block')
+    ssl_AES1024B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES1024B_bm_ref, 'details', 'aes_128_cbc', '1024_block')
+    ssl_AES8192B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES8192B_bm_ref, 'details', 'aes_128_cbc', '8192_block')
     ssl_AES_bm_index = (ssl_AES16B_bm_index + ssl_AES64B_bm_index + ssl_AES256B_bm_index + ssl_AES1024B_bm_index + ssl_AES8192B_bm_index) / 5
 
     ssl_bm_index = (ssl_RSA_bm_index + ssl_AES_bm_index) / 2
@@ -138,17 +138,17 @@ def ssl_index():
     ssl_AES1024B_vm_ref = get_reference('compute', 'ssl_vm', 'AES', '1024B')
     ssl_AES8192B_vm_ref = get_reference('compute', 'ssl_vm', 'AES', '8192B')
 
-    ssl_RSA512b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA512b_vm_ref, '4  SSL result', '2. RSA signatures', '1. 512 bits (sign/s)')
-    ssl_RSA1024b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA1024b_vm_ref, '4  SSL result', '2. RSA signatures', '2. 1024 bits (sign/s)')
-    ssl_RSA2048b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA2048b_vm_ref, '4  SSL result', '2. RSA signatures', '3. 2048 bits (sign/s)')
-    ssl_RSA4096b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA4096b_vm_ref, '4  SSL result', '2. RSA signatures', '4. 4096 bits (sign/s)')
+    ssl_RSA512b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA512b_vm_ref, 'details', 'rsa_sig', '512_bits')
+    ssl_RSA1024b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA1024b_vm_ref, 'details', 'rsa_sig', '1024_bits')
+    ssl_RSA2048b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA2048b_vm_ref, 'details', 'rsa_sig', '2048_bits')
+    ssl_RSA4096b_vm_index = get_index(ssl_dict, "ssl_vm", ssl_RSA4096b_vm_ref, 'details', 'rsa_sig', '4096_bits')
     ssl_RSA_vm_index = (ssl_RSA512b_vm_index + ssl_RSA1024b_vm_index + ssl_RSA2048b_vm_index + ssl_RSA4096b_vm_index) / 4
 
-    ssl_AES16B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES16B_vm_ref, '4  SSL result', '3. AES-128-cbc throughput', '1. 16 Bytes block (B/sec)')
-    ssl_AES64B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES64B_vm_ref, '4  SSL result', '3. AES-128-cbc throughput', '2. 64 Bytes block (B/sec)')
-    ssl_AES256B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES256B_vm_ref, '4  SSL result', '3. AES-128-cbc throughput', '3. 256 Bytes block (B/sec)')
-    ssl_AES1024B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES1024B_vm_ref, '4  SSL result', '3. AES-128-cbc throughput', '4. 1024 Bytes block (B/sec)')
-    ssl_AES8192B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES8192B_vm_ref, '4  SSL result', '3. AES-128-cbc throughput', '5. 8192 Bytes block (B/sec)')
+    ssl_AES16B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES16B_vm_ref, 'details', 'aes_128_cbc', '16_block')
+    ssl_AES64B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES64B_vm_ref, 'details', 'aes_128_cbc', '64_block')
+    ssl_AES256B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES256B_vm_ref, 'details', 'aes_128_cbc', '256_block')
+    ssl_AES1024B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES1024B_vm_ref, 'details', 'aes_128_cbc', '1024_block')
+    ssl_AES8192B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES8192B_vm_ref, 'details', 'aes_128_cbc', '8192_block')
     ssl_AES_vm_index = (ssl_AES16B_vm_index + ssl_AES64B_vm_index + ssl_AES256B_vm_index + ssl_AES1024B_vm_index + ssl_AES8192B_vm_index) / 5
 
     ssl_vm_index = (ssl_RSA_vm_index + ssl_AES_vm_index) / 2
@@ -156,6 +156,6 @@ def ssl_index():
     ssl_index = (ssl_bm_index + ssl_vm_index) / 2
 
     ssl_dict_i = {}
-    ssl_dict_i['1. Index'] = ssl_index
-    ssl_dict_i['2. Results'] = ssl_dict
+    ssl_dict_i['index'] = ssl_index
+    ssl_dict_i['results'] = ssl_dict
     return ssl_dict_i
diff --git a/data/ref_results/compute_suite.py b/data/ref_results/compute_suite.py
index bcaf83c8..7154183c 100644
--- a/data/ref_results/compute_suite.py
+++ b/data/ref_results/compute_suite.py
@@ -34,7 +34,7 @@ l = len(compute_bench_list)
 temp = 0
 for benchmark in compute_bench_list:
     try:
-        temp = temp + float(compute_dict[benchmark]['1. Index'])
+        temp = temp + float(compute_dict[benchmark]['index'])
     except KeyError:
         l = l - 1
         pass
@@ -45,6 +45,6 @@ else:
     compute_suite_index = temp / l
     compute_dict_f = {}
     compute_dict_f['index'] = compute_suite_index
-    compute_dict_f['suite results'] = compute_dict
+    compute_dict_f['suite_results'] = compute_dict
     with open('../../results/compute_result.json', 'w+') as result_json:
         json.dump(compute_dict_f, result_json, indent=4, sort_keys=True)
diff --git a/data/ref_results/index_calculation.py b/data/ref_results/index_calculation.py
index e3c75350..7dee7497 100644
--- a/data/ref_results/index_calculation.py
+++ b/data/ref_results/index_calculation.py
@@ -28,7 +28,7 @@ def generic_index(dict_gen, testcase, reference_num, *args):
     result = 0
     for k, v in dict_gen.iteritems():
         dict_temp = dict_gen[k]
-        if dict_gen[k]['1  Testcase Name'] == str(testcase):
+        if dict_gen[k]['name'] == str(testcase):
             count = count + 1
             for arg in args:
                 if arg == args[c - 1]:
diff --git a/data/ref_results/network_benchmarks_indices.py b/data/ref_results/network_benchmarks_indices.py
index 96ccd4fc..f4c581db 100644
--- a/data/ref_results/network_benchmarks_indices.py
+++ b/data/ref_results/network_benchmarks_indices.py
@@ -6,15 +6,15 @@ from result_accum import result_concat as concat
 def iperf_index():
     iperf_dict = concat('../../results/iperf/')
     iperf_bm_ref = get_reference('network', 'iperf_bm', 'throughput received(b/s)')
-    iperf_bm_index = get_index(iperf_dict, 'iperf_bm', iperf_bm_ref, '4  IPERF result', '2. Bandwidth', '2. throughput Received (b/s)')
+    iperf_bm_index = get_index(iperf_dict, 'iperf_bm', iperf_bm_ref, 'details', 'bandwidth', 'received_throughput')
     iperf_vm_ref = get_reference('network', 'iperf_vm', 'throughput received(b/s)')
-    iperf_vm_index = get_index(iperf_dict, 'iperf_vm', iperf_vm_ref, '4  IPERF result', '2. Bandwidth', '2. throughput Received (b/s)')
+    iperf_vm_index = get_index(iperf_dict, 'iperf_vm', iperf_vm_ref, 'details', 'bandwidth', 'received_throughput')
 
     iperf_vm_2_ref = get_reference('network', 'iperf_vm_2', 'throughput received(b/s)')
-    iperf_vm_2_index = get_index(iperf_dict, 'iperf_vm_2', iperf_vm_2_ref, '4  IPERF result', '2. Bandwidth', '2. throughput Received (b/s)')
+    iperf_vm_2_index = get_index(iperf_dict, 'iperf_vm_2', iperf_vm_2_ref, 'details', 'bandwidth', 'received_throughput')
     iperf_index = float(iperf_bm_index + iperf_vm_index + iperf_vm_2_index) / 3
     print iperf_index
     iperf_dict_i = {}
-    iperf_dict_i['1. Index'] = iperf_index
-    iperf_dict_i['2. Results'] = iperf_dict
+    iperf_dict_i['index'] = iperf_index
+    iperf_dict_i['results'] = iperf_dict
     return iperf_dict_i
diff --git a/data/ref_results/network_suite.py b/data/ref_results/network_suite.py
index 37dcb093..ae4ed107 100644
--- a/data/ref_results/network_suite.py
+++ b/data/ref_results/network_suite.py
@@ -14,7 +14,7 @@ l = len(network_bench_list)
 
 for benchmark in network_bench_list:
     try:
-        temp = temp + float(network_dict[benchmark]['1. Index'])
+        temp = temp + float(network_dict[benchmark]['index'])
     except:
         l = l - 1
         pass
@@ -25,6 +25,6 @@ else:
     network_suite_index = temp / len(network_bench_list)
     network_dict_f = {}
     network_dict_f['index'] = network_suite_index
-    network_dict_f['suite results'] = network_dict
+    network_dict_f['suite_results'] = network_dict
     with open('../../results/network_result.json', 'w+') as result_json:
         json.dump(network_dict_f, result_json, indent=4, sort_keys=True)
diff --git a/data/ref_results/storage_benchmarks_indices.py b/data/ref_results/storage_benchmarks_indices.py
index f51b3d6e..6c5dd435 100644
--- a/data/ref_results/storage_benchmarks_indices.py
+++ b/data/ref_results/storage_benchmarks_indices.py
@@ -6,18 +6,17 @@ from result_accum import result_concat as concat
 def fio_index():
     fio_dict = concat('../../results/fio/')
     fio_r_bm_ref = get_reference('storage', 'fio_bm', 'read', 'IOPS')
-    fio_r_bm_index = get_index(fio_dict, 'fio_bm', fio_r_bm_ref, '4  FIO result', 'Job_0', 'read', 'IO/sec')
-
+    fio_r_bm_index = get_index(fio_dict, 'fio_bm', fio_r_bm_ref, 'details', 'job_0', 'read', 'io_ps')
     fio_w_bm_ref = get_reference('storage', 'fio_bm', 'write', 'IOPS')
-    fio_w_bm_index = get_index(fio_dict, 'fio_bm', fio_w_bm_ref, '4  FIO result', 'Job_0', 'write', 'IO/sec')
+    fio_w_bm_index = get_index(fio_dict, 'fio_bm', fio_w_bm_ref, 'details', 'job_0', 'write', 'io_ps')
 
     fio_bm_index = (fio_r_bm_index + fio_w_bm_index) / 2
 
     fio_r_vm_ref = get_reference('storage', 'fio_vm', 'read', 'IOPS')
-    fio_r_vm_index = get_index(fio_dict, 'fio_vm', fio_r_vm_ref, '4  FIO result', 'Job_0', 'read', 'IO/sec')
+    fio_r_vm_index = get_index(fio_dict, 'fio_vm', fio_r_vm_ref, 'details', 'job_0', 'read', 'io_ps')
 
     fio_w_vm_ref = get_reference('storage', 'fio_vm', 'write', 'IOPS')
-    fio_w_vm_index = get_index(fio_dict, 'fio_vm', fio_w_vm_ref, '4  FIO result', 'Job_0', 'write', 'IO/sec')
+    fio_w_vm_index = get_index(fio_dict, 'fio_vm', fio_w_vm_ref, 'details', 'job_0', 'write', 'io_ps')
 
     fio_vm_index = (fio_r_vm_index + fio_w_vm_index) / 2
 
@@ -25,6 +24,6 @@ def fio_index():
     print fio_index
 
     fio_dict_i = {}
-    fio_dict_i['1. Index'] = fio_index
-    fio_dict_i['2. Results'] = fio_dict
+    fio_dict_i['index'] = fio_index
+    fio_dict_i['results'] = fio_dict
     return fio_dict_i
diff --git a/data/ref_results/storage_suite.py b/data/ref_results/storage_suite.py
index 52d6c8c6..38d97622 100644
--- a/data/ref_results/storage_suite.py
+++ b/data/ref_results/storage_suite.py
@@ -13,7 +13,7 @@ l = len(storage_bench_list)
 temp = 0
 for benchmark in storage_bench_list:
     try:
-        temp = temp + float(storage_dict[benchmark]['1. Index'])
+        temp = temp + float(storage_dict[benchmark]['index'])
     except KeyError:
         l -= 1
 if l == 0:
@@ -22,6 +22,6 @@ else:
     storage_suite_index = temp / l
     storage_dict_f = {}
     storage_dict_f['index'] = storage_suite_index
-    storage_dict_f['storage suite'] = storage_dict
+    storage_dict_f['storage_suite'] = storage_dict
     with open('../../results/storage_result.json', 'w+') as result_json:
         json.dump(storage_dict_f, result_json, indent=4, sort_keys=True)