Merge "Bugfix:Fix index always be 0 problem."

3 files changed, 11 insertions, 93 deletions

diff --git a/scripts/ref_results/compute_benchmarks_indices.py b/scripts/ref_results/compute_benchmarks_indices.py
index 9012cefc..0b6eae36 100644
--- a/scripts/ref_results/compute_benchmarks_indices.py
+++ b/scripts/ref_results/compute_benchmarks_indices.py
@@ -10,7 +10,6 @@ def dpi_index():
 
     dpi_vm_ref = get_reference('compute', 'dpi_vm')
     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['index'] = dpi_index
@@ -118,11 +117,11 @@ def ssl_index():
     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, '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_AES16B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES16B_bm_ref, 'details', 'aes_128_cbc', '16B_block')
+    ssl_AES64B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES64B_bm_ref, 'details', 'aes_128_cbc', '64B_block')
+    ssl_AES256B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES256B_bm_ref, 'details', 'aes_128_cbc', '256B_block')
+    ssl_AES1024B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES1024B_bm_ref, 'details', 'aes_128_cbc', '1024B_block')
+    ssl_AES8192B_bm_index = get_index(ssl_dict, "ssl_bm", ssl_AES8192B_bm_ref, 'details', 'aes_128_cbc', '8192B_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
@@ -144,11 +143,11 @@ def ssl_index():
     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, '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_AES16B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES16B_vm_ref, 'details', 'aes_128_cbc', '16B_block')
+    ssl_AES64B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES64B_vm_ref, 'details', 'aes_128_cbc', '64B_block')
+    ssl_AES256B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES256B_vm_ref, 'details', 'aes_128_cbc', '256B_block')
+    ssl_AES1024B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES1024B_vm_ref, 'details', 'aes_128_cbc', '1024B_block')
+    ssl_AES8192B_vm_index = get_index(ssl_dict, "ssl_vm", ssl_AES8192B_vm_ref, 'details', 'aes_128_cbc', '8192B_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
diff --git a/scripts/ref_results/generator_ref_json.py b/scripts/ref_results/generator_ref_json.py
deleted file mode 100644
index 6b2d813c..00000000
--- a/scripts/ref_results/generator_ref_json.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import json
-
-dict_ref = {}
-dict_ref['compute'] = {}
-dict_ref['compute']['dpi_bm'] = 8.12
-dict_ref['compute']['dpi_vm'] = 22.12
-
-dict_ref['compute']['whetstone_bm'] = {}
-dict_ref['compute']['whetstone_vm'] = {}
-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'] = {}
-dict_ref['compute']['dhrystone_bm']['single_cpu'] = 3231.7
-dict_ref['compute']['dhrystone_bm']['multi_cpu'] = 103362.1
-dict_ref['compute']['dhrystone_vm']['single_cpu'] = 2953.6
-dict_ref['compute']['dhrystone_vm']['multi_cpu'] = 10585.8
-
-dict_ref['compute']['ssl_bm'] = {}
-dict_ref['compute']['ssl_bm']['RSA'] = {}
-dict_ref['compute']['ssl_bm']['AES'] = {}
-dict_ref['compute']['ssl_bm']['RSA']['512b'] = 22148.9
-dict_ref['compute']['ssl_bm']['RSA']['1024b'] = 7931.44
-dict_ref['compute']['ssl_bm']['RSA']['2048b'] = 1544.3
-dict_ref['compute']['ssl_bm']['RSA']['4096b'] = 161.92
-dict_ref['compute']['ssl_bm']['AES']['16B'] = 735490250
-dict_ref['compute']['ssl_bm']['AES']['64B'] = 788429210
-dict_ref['compute']['ssl_bm']['AES']['256B'] = 803323650
-dict_ref['compute']['ssl_bm']['AES']['1024B'] = 808861020
-dict_ref['compute']['ssl_bm']['AES']['8192B'] = 807701160
-
-dict_ref['compute']['ssl_vm'] = {}
-dict_ref['compute']['ssl_vm']['RSA'] = {}
-dict_ref['compute']['ssl_vm']['AES'] = {}
-dict_ref['compute']['ssl_vm']['RSA']['512b'] = 22148.9
-dict_ref['compute']['ssl_vm']['RSA']['1024b'] = 7931.44
-dict_ref['compute']['ssl_vm']['RSA']['2048b'] = 1544.3
-dict_ref['compute']['ssl_vm']['RSA']['4096b'] = 161.92
-dict_ref['compute']['ssl_vm']['AES']['16B'] = 735490250
-dict_ref['compute']['ssl_vm']['AES']['64B'] = 788429210
-dict_ref['compute']['ssl_vm']['AES']['256B'] = 803323650
-dict_ref['compute']['ssl_vm']['AES']['1024B'] = 808861020
-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)'] = 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)'] = 12147.59
-dict_ref['compute']['ramspeed_vm']['FLOATmem']['Average (MB/s)'] = 9064.09
-
-dict_ref['storage'] = {}
-dict_ref['storage']['fio_bm'] = {}
-dict_ref['storage']['fio_bm']['read'] = {}
-dict_ref['storage']['fio_bm']['write'] = {}
-dict_ref['storage']['fio_bm']['read']['IOPS'] = 6693
-dict_ref['storage']['fio_bm']['write']['IOPS'] = 6688
-
-dict_ref['storage']['fio_vm'] = {}
-dict_ref['storage']['fio_vm']['read'] = {}
-dict_ref['storage']['fio_vm']['write'] = {}
-dict_ref['storage']['fio_vm']['read']['IOPS'] = 2239
-dict_ref['storage']['fio_vm']['write']['IOPS'] = 2237
-
-dict_ref['network'] = {}
-dict_ref['network']['iperf_bm'] = {}
-dict_ref['network']['iperf_vm'] = {}
-dict_ref['network']['iperf_vm_2'] = {}
-dict_ref['network']['iperf_bm']['throughput received(b/s)'] = 944473000.0
-dict_ref['network']['iperf_vm']['throughput received(b/s)'] = 14416700000.0
-dict_ref['network']['iperf_vm_2']['throughput received(b/s)'] = 2461530000.0
-with open('reference.json', 'w+') as result_json:
-    json.dump(dict_ref, result_json, indent=4, sort_keys=True)
diff --git a/scripts/ref_results/index_calculation.py b/scripts/ref_results/index_calculation.py
index 4ead79ff..95c3c4a6 100644
--- a/scripts/ref_results/index_calculation.py
+++ b/scripts/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]['name'] == str(testcase):
+        if dict_gen[k]['name'] == '{0}.yaml'.format(testcase):
             count = count + 1
             for arg in args:
                 if arg == args[c - 1]: