diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 17:38:25 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 17:38:25 +0800 |
| commit | 6827bf2d62ac0935369a86b87782f404ac413570 (patch) | |
| tree | e5ba329034c7b5b48b704dde21e14ac69a1d3d92 /resources/ansible_roles | |
| parent | d158e53addc56a9f92ecf0947eda4110c23da8ee (diff) | |
Add dpi metrics to calculation
Change-Id: I4ae05af6e8c29d94b2b3f3b4dd748c4325dfa410
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/ansible_roles')
| -rw-r--r-- | resources/ansible_roles/nDPI/tasks/main.yml | 3 | ||||
| -rw-r--r-- | resources/ansible_roles/qtip/tasks/calculate.yml | 3 |
2 files changed, 4 insertions, 2 deletions
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: diff --git a/resources/ansible_roles/qtip/tasks/calculate.yml b/resources/ansible_roles/qtip/tasks/calculate.yml index e0673645..b00707ed 100644 --- a/resources/ansible_roles/qtip/tasks/calculate.yml +++ b/resources/ansible_roles/qtip/tasks/calculate.yml @@ -14,7 +14,8 @@ metrics: ssl_rsa: "{{ ssl_rsa_metrics }}" ssl_aes: "{{ ssl_aes_metrics }}" + dpi_throughput: "{{ dpi_metrics }}" spec: "{{ qtip_resources }}/QPI/compute.yaml" - dest: "{{ qtip_results }}/qpi_result.json" + dest: "{{ qtip_results }}/compute.json" register: qpi_result delegate_to: localhost |