aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-19 03:27:57 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-04-19 03:27:57 +0000
commit2d55ca2996755ea25012001e499c4ac0dc54b765 (patch)
treef15d8119d4f7ac818be5d7e6f5ccf11300e60102
parent86f10e318baa875d2b729f3bf7b5bb588a43f4ff (diff)
parent65d6bc2e403b17cd951b001d4c050192c541c109 (diff)
Merge "Collect dpi metrics and report"
-rw-r--r--resources/metric/nDPI.yaml4
-rw-r--r--resources/template/dpi-metrics.j27
-rw-r--r--tests/integration/run.yaml7
3 files changed, 16 insertions, 2 deletions
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"