From c004fa1abd8069243b6cd4d9f9af66db2395351f Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Mon, 24 Apr 2017 21:39:59 +0800
Subject: Export collected metrics to json as inputs for calculating

Change-Id: Id2dce1e750f646aeb972221229556fcd647a3637
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/ansible_roles/nDPI/tasks/main.yml      | 1 +
 resources/ansible_roles/openssl/tasks/main.yml   | 3 ++-
 resources/ansible_roles/ramspeed/tasks/main.yml  | 2 ++
 resources/ansible_roles/unixbench/tasks/main.yml | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/resources/ansible_roles/nDPI/tasks/main.yml b/resources/ansible_roles/nDPI/tasks/main.yml
index 230ee2e1..c007a613 100644
--- a/resources/ansible_roles/nDPI/tasks/main.yml
+++ b/resources/ansible_roles/nDPI/tasks/main.yml
@@ -66,6 +66,7 @@
       # 	nDPI throughput:       1.46 M pps / 13.69 Gb/sec
       # TODO(yujunz) convert "M pps" and "K pps" to number
       - 'nDPI throughput:\s+?(?P<dpi_pps>\d+.\d+.*) \/ (?P<dpi_bps>\d+.\d+.*)$'
+    export_to: "{{ qtip_results }}/dpi_metrics.json"
   register: dpi_metrics
   delegate_to: localhost
 
diff --git a/resources/ansible_roles/openssl/tasks/main.yml b/resources/ansible_roles/openssl/tasks/main.yml
index 9829de24..6ef24bbc 100644
--- a/resources/ansible_roles/openssl/tasks/main.yml
+++ b/resources/ansible_roles/openssl/tasks/main.yml
@@ -59,6 +59,7 @@
           ^rsa\s+4096\sbits\s.+\s+
           ?(?P<rsa_sign_4096>\d+\.\d)\s+
           ?(?P<rsa_verify_4096>\d+\.\d)$
+    export_to: "{{ qtip_results }}/ssl_rsa_metrics.json"
   register: ssl_rsa_metrics
 
 - name: collect ssl aes metrics
@@ -72,7 +73,7 @@
           ?(?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
+    export_to: "{{ qtip_results }}/ssl_aes_metrics.json"
   register: ssl_aes_metrics
 
 - name: create SSL report
diff --git a/resources/ansible_roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml
index bdb23b6c..affa1111 100644
--- a/resources/ansible_roles/ramspeed/tasks/main.yml
+++ b/resources/ansible_roles/ramspeed/tasks/main.yml
@@ -69,6 +69,7 @@
       - '^INTEGER\s+BatchRun\s+Add:\s+?(?P<add>\d+\.\d+)\sMB/s$'
       - '^INTEGER\s+BatchRun\s+Triad:\s+?(?P<triad>\d+\.\d+)\sMB/s$'
       - '^INTEGER\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$'
+    export_to: "{{ qtip_results }}/ram_int_metrics.json"
   register: intmem_metrics
 
 - name: collect float memory metrics from ramspeed
@@ -80,6 +81,7 @@
       - '^FL-POINT\s+BatchRun\s+Add:\s+?(?P<add>\d+\.\d+)\sMB/s$'
       - '^FL-POINT\s+BatchRun\s+Triad:\s+?(?P<triad>\d+\.\d+)\sMB/s$'
       - '^FL-POINT\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$'
+    export_to: "{{ qtip_results }}/ram_float_metrics.json"
   register: floatmem_metrics
 
 - name: create memory metrics report
diff --git a/resources/ansible_roles/unixbench/tasks/main.yml b/resources/ansible_roles/unixbench/tasks/main.yml
index 9b0a6f73..e087bcb9 100644
--- a/resources/ansible_roles/unixbench/tasks/main.yml
+++ b/resources/ansible_roles/unixbench/tasks/main.yml
@@ -61,6 +61,7 @@
       # Double-Precision Whetstone                       55.0       3720.5    676.5
       - '^Dhrystone 2 using register variables\s+(\d+\.\d+)\s+(?P<dhrystone_lps>\d+\.\d+)\s+(\d+\.\d+)'
       - '^Double-Precision Whetstone\s+(\d+\.\d+)\s+(?P<whetstone_MWIPS>\d+\.\d+)\s+(\d+\.\d+)'
+    export_to: "{{ qtip_results }}/arithmetic_metrics.json"
   register: arithmetic_metrics
   delegate_to: localhost
 
-- 
cgit 1.2.3-korg