diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-22 15:00:30 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-24 08:51:48 +0800 |
| commit | b9ac93be6587754b1e7ddc7c6bdafbf1f50fa50c (patch) | |
| tree | 6d6128b918e2229845a89262e34194aaee3f7539 /resources | |
| parent | c613b3a509f061885304d0b82834c6865cbfe4ce (diff) | |
Cleanup metrics report
Change-Id: I79b56d7490930db171fe93e314be4f6d73b0063b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources')
7 files changed, 24 insertions, 20 deletions
diff --git a/resources/ansible_roles/nDPI/templates/dpi-metrics.j2 b/resources/ansible_roles/nDPI/templates/dpi-metrics.j2 index 4d6e0b69..ca182f9d 100644 --- 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 6f8f8c71..53642dbe 100644 --- 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 cce42fa1..58f0608d 100644 --- 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 index 00000000..73d4dad4 --- /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 index 5989d77c..00000000 --- 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 index 00000000..ea1de9e9 --- /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 index b494515f..00000000 --- a/resources/ansible_roles/unixbench/templates/integer.j2 +++ /dev/null @@ -1,2 +0,0 @@ -Integer -=======
\ No newline at end of file |