Cleanup metrics report

Change-Id: I79b56d7490930db171fe93e314be4f6d73b0063b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

diff --git a/resources/ansible_roles/nDPI/templates/dpi-metrics.j2 b/resources/ansible_roles/nDPI/templates/dpi-metrics.j2
index 4d6e0b6..ca182f9 100644 (file)
--- a/resources/ansible_roles/nDPI/templates/dpi-metrics.j2
+++ b/resources/ansible_roles/nDPI/templates/dpi-metrics.j2
@@ -1,4 +1,4 @@
 nDPI throughput
 ===============
 
-{{ ('Result:', "{} / {}".format(dpi_metrics.dpi_pps[0], dpi_metrics.dpi_bps[0]))|justify }}
+{{ ('Result', "{} / {}".format(dpi_metrics.dpi_pps[0], dpi_metrics.dpi_bps[0]))|justify }}

diff --git a/resources/ansible_roles/openssl/templates/ssl-metrics.j2 b/resources/ansible_roles/openssl/templates/ssl-metrics.j2
index 6f8f8c7..53642db 100644 (file)
--- a/resources/ansible_roles/openssl/templates/ssl-metrics.j2
+++ b/resources/ansible_roles/openssl/templates/ssl-metrics.j2
@@ -6,20 +6,20 @@ SSL metrics
 RSA
 ---
 
-{{ ('Sign 512 bits', ssl_rsa_metrics.rsa_sign_512)|justify }}
-{{ ('Verify 512 bits', ssl_rsa_metrics.rsa_verify_512)|justify }}
-{{ ('Sign 1024 bits', ssl_rsa_metrics.rsa_sign_1024)|justify }}
-{{ ('Verify 1024 bits', ssl_rsa_metrics.rsa_verify_1024)|justify }}
-{{ ('Sign 2048 bits', ssl_rsa_metrics.rsa_sign_2048)|justify }}
-{{ ('Verify 2048 bits', ssl_rsa_metrics.rsa_verify_2048)|justify }}
-{{ ('Sign 4096 bits', ssl_rsa_metrics.rsa_sign_4096)|justify }}
-{{ ('Verify 4096 bits', ssl_rsa_metrics.rsa_verify_4096)|justify }}
+{{ ('Sign 512 bits', ssl_rsa_metrics.rsa_sign_512[0])|justify }}
+{{ ('Verify 512 bits', ssl_rsa_metrics.rsa_verify_512[0])|justify }}
+{{ ('Sign 1024 bits', ssl_rsa_metrics.rsa_sign_1024[0])|justify }}
+{{ ('Verify 1024 bits', ssl_rsa_metrics.rsa_verify_1024[0])|justify }}
+{{ ('Sign 2048 bits', ssl_rsa_metrics.rsa_sign_2048[0])|justify }}
+{{ ('Verify 2048 bits', ssl_rsa_metrics.rsa_verify_2048[0])|justify }}
+{{ ('Sign 4096 bits', ssl_rsa_metrics.rsa_sign_4096[0])|justify }}
+{{ ('Verify 4096 bits', ssl_rsa_metrics.rsa_verify_4096[0])|justify }}
 
 AES
 ---
 
-{{ ('128 CBC 16 bytes', ssl_aes_metrics.aes_128_cbc_16_bytes)|justify }}
-{{ ('128 CBC 64 bytes', ssl_aes_metrics.aes_128_cbc_64_bytes)|justify }}
-{{ ('128 CBC 256 bytes', ssl_aes_metrics.aes_128_cbc_256_bytes)|justify }}
-{{ ('128 CBC 1024 bytes', ssl_aes_metrics.aes_128_cbc_1024_bytes)|justify }}
-{{ ('128 CBC 8192 bytes', ssl_aes_metrics.aes_128_cbc_8192_bytes)|justify }}
+{{ ('128 CBC 16 bytes', ssl_aes_metrics.aes_128_cbc_16_bytes[0])|justify }}
+{{ ('128 CBC 64 bytes', ssl_aes_metrics.aes_128_cbc_64_bytes[0])|justify }}
+{{ ('128 CBC 256 bytes', ssl_aes_metrics.aes_128_cbc_256_bytes[0])|justify }}
+{{ ('128 CBC 1024 bytes', ssl_aes_metrics.aes_128_cbc_1024_bytes[0])|justify }}
+{{ ('128 CBC 8192 bytes', ssl_aes_metrics.aes_128_cbc_8192_bytes[0])|justify }}

diff --git a/resources/ansible_roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml
index cce42fa..58f0608 100644 (file)
--- a/resources/ansible_roles/unixbench/tasks/main.yml
+++ b/resources/ansible_roles/unixbench/tasks/main.yml
@@ -40,7 +40,7 @@
     src: "{{ item }}.j2"
     dest: "{{ qtip_results }}/{{ item }}"
   with_items:
-    - floating-point
-    - integer
+    - floating-point-metrics
+    - integer-metrics
   delegate_to: localhost
   tags: [report]

diff --git a/resources/ansible_roles/unixbench/templates/floating-point-metrics.j2 b/resources/ansible_roles/unixbench/templates/floating-point-metrics.j2
new file mode 100644 (file)
index 0000000..73d4dad
--- /dev/null
+++ b/resources/ansible_roles/unixbench/templates/floating-point-metrics.j2
@@ -0,0 +1,4 @@
+Floating Point
+==============
+
+check logs in ``unixbench/``
\ No newline at end of file

diff --git a/resources/ansible_roles/unixbench/templates/floating-point.j2 b/resources/ansible_roles/unixbench/templates/floating-point.j2
deleted file mode 100644 (file)
index 5989d77..0000000
--- a/resources/ansible_roles/unixbench/templates/floating-point.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-Floating Point
-==============
\ No newline at end of file

diff --git a/resources/ansible_roles/unixbench/templates/integer-metrics.j2 b/resources/ansible_roles/unixbench/templates/integer-metrics.j2
new file mode 100644 (file)
index 0000000..ea1de9e
--- /dev/null
+++ b/resources/ansible_roles/unixbench/templates/integer-metrics.j2
@@ -0,0 +1,4 @@
+Integer
+=======
+
+check logs in ``unixbench/``
\ No newline at end of file

diff --git a/resources/ansible_roles/unixbench/templates/integer.j2 b/resources/ansible_roles/unixbench/templates/integer.j2
deleted file mode 100644 (file)
index b494515..0000000
--- a/resources/ansible_roles/unixbench/templates/integer.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-Integer
-=======
\ No newline at end of file