From 1f8e4ddcc850e59909778cc583811353f338001a Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Fri, 21 Apr 2017 12:13:25 +0800
Subject: Add AES testing in SSL metrics

Change-Id: Iee1b1711d9ce07c468bc390966c55bd49abea228
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/roles/openssl/tasks/main.yml | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'resources/roles/openssl/tasks/main.yml')

diff --git a/resources/roles/openssl/tasks/main.yml b/resources/roles/openssl/tasks/main.yml
index 42efbeb4..7975c177 100644
--- a/resources/roles/openssl/tasks/main.yml
+++ b/resources/roles/openssl/tasks/main.yml
@@ -16,11 +16,11 @@
   command: openssl speed rsa
   register: openssl_rsa_log
 
-#- name: AES speed measurement
-#  command: openssl speed -evp aes-128-cbc
-#  register: openssl_aes_log
+- name: AES speed measurement
+  command: openssl speed -evp aes-128-cbc
+  register: openssl_aes_log
 
-- name: collect ssl metrics from openssl
+- name: collect ssl rsa metrics
   collect:
     string: "{{ openssl_rsa_log.stdout }}"
     patterns:
@@ -40,18 +40,22 @@
           ^rsa\s+4096\sbits\s.+\s+
           ?(?P<rsa_sign_4096>\d+\.\d)\s+
           ?(?P<rsa_verify_4096>\d+\.\d)$
-    dump: openssl_rsa_log
-  register: openssl_rsa_metrics
+    dump: openssl_rsa.log
+  register: ssl_rsa_metrics
 
-#  - filename: AES-128-CBC_dump
-#    grep:
-#      - |-
-#          ^aes-128-cbc\s+
-#          ?(?P<aes_128_cbc_16_bytes>\d+\.\w+)\s+
-#          ?(?P<aes_128_cbc_64_bytes>\d+\.\w+)\s+
-#          ?(?P<aes_128_cbc_256_bytes>\d+\.\w+)\s+
-#          ?(?P<aes_128_cbc_1024_bytes>\d+\.\w+)\s+
-#          ?(?P<aes_128_cbc_8192_bytes>\d+\.\w+)$
+- name: collect ssl aes metrics
+  collect:
+    string: "{{ openssl_aes_log.stdout }}"
+    patterns:
+      - |-
+          ^aes-128-cbc\s+
+          ?(?P<aes_128_cbc_16_bytes>\d+\.\w+)\s+
+          ?(?P<aes_128_cbc_64_bytes>\d+\.\w+)\s+
+          ?(?P<aes_128_cbc_256_bytes>\d+\.\w+)\s+
+          ?(?P<aes_128_cbc_1024_bytes>\d+\.\w+)\s+
+          ?(?P<aes_128_cbc_8192_bytes>\d+\.\w+)$
+    dump: openssl_aes.log
+  register: ssl_aes_metrics
 
 - name: create SSL report
   template:
-- 
cgit 1.2.3-korg