From 6827bf2d62ac0935369a86b87782f404ac413570 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Tue, 25 Apr 2017 17:38:25 +0800
Subject: Add dpi metrics to calculation

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

(limited to 'resources/ansible_roles/nDPI')

diff --git a/resources/ansible_roles/nDPI/tasks/main.yml b/resources/ansible_roles/nDPI/tasks/main.yml
index 6dc7bf9d..ffe32c53 100644
--- a/resources/ansible_roles/nDPI/tasks/main.yml
+++ b/resources/ansible_roles/nDPI/tasks/main.yml
@@ -61,10 +61,11 @@
     patterns:
       # 	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+.*)$'
+      - 'nDPI throughput:\s+?(?P<dpi_pps>\d+.\d+.*) pps \/ (?P<dpi_bps>\d+.\d+.*)b/sec$'
     dest: "{{ output }}/metrics.json"
   register: dpi_metrics
   delegate_to: localhost
+  tags: collect
 
 - name: create dpi report
   template:
-- 
cgit 1.2.3-korg