From 65d6bc2e403b17cd951b001d4c050192c541c109 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Tue, 18 Apr 2017 17:26:20 +0800
Subject: Collect dpi metrics and report

Change-Id: I0e02cff9a5bfc123b3227803289fc03abe27f112
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/metric/nDPI.yaml        | 4 +++-
 resources/template/dpi-metrics.j2 | 7 +++++++
 tests/integration/run.yaml        | 7 ++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 resources/template/dpi-metrics.j2

diff --git a/resources/metric/nDPI.yaml b/resources/metric/nDPI.yaml
index 79225443..0391302a 100644
--- a/resources/metric/nDPI.yaml
+++ b/resources/metric/nDPI.yaml
@@ -73,6 +73,8 @@
   collect:
     string: "{{ nDPI_out.stdout }}"
     patterns:
-      - '^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\s.+\spps.+?(?P<bps>\d+.\d+)\s.+\/sec'
+      # 	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+.*)$'
     dump: 'nDPI.log'
   register: dpi_metrics
diff --git a/resources/template/dpi-metrics.j2 b/resources/template/dpi-metrics.j2
new file mode 100644
index 00000000..4de200b6
--- /dev/null
+++ b/resources/template/dpi-metrics.j2
@@ -0,0 +1,7 @@
+nDPI throughput
+===============
+
+{% for host in groups['compute'] %}
+{% set dpi_metrics=hostvars[host].dpi_metrics %}
+{{ (hostvars[host].ansible_hostname, "{} / {}".format(dpi_metrics.dpi_pps[0], dpi_metrics.dpi_bps[0]))|justify }}
+{% endfor %}
diff --git a/tests/integration/run.yaml b/tests/integration/run.yaml
index 99bee5ea..f02ebf89 100644
--- a/tests/integration/run.yaml
+++ b/tests/integration/run.yaml
@@ -26,7 +26,7 @@
     vars:
       nDPI_cwd: "{{ ansible_env.HOME }}/qtip/nDPI"
       nDPI_file: "dpi.pcap"
-    tags: [nDPI]
+    tags: [dpi]
 
 - hosts: compute
   tasks:
@@ -63,6 +63,11 @@
       src: "{{ qtip_resources }}/template/qpi-report.j2"
       dest: "{{ qtip_reports }}/qpi-report"
     tags: [report]
+  - name: create dpi metrics report
+    template:
+      src: "{{ qtip_resources }}/template/dpi-metrics.j2"
+      dest: "{{ qtip_reports }}/dpi-metrics"
+    tags: [report, dpi]
   - name: push result to testapi
     uri:
       url: "{{ testapi_url }}/results"
-- 
cgit 1.2.3-korg