Add dpi metrics to calculation

Change-Id: I4ae05af6e8c29d94b2b3f3b4dd748c4325dfa410
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

diff --git a/resources/QPI/compute.yaml b/resources/QPI/compute.yaml
index 7746cbd..cf2d101 100644 (file)
--- a/resources/QPI/compute.yaml
+++ b/resources/QPI/compute.yaml
@@ -47,3 +47,12 @@ sections: # split based on different application
             baseline: 672675.50k
           - name: aes_128_cbc_8192_bytes
             baseline: 672344.75k
+  - name: DPI
+    description: deep packet inspection
+    metrics:
+      - name: dpi_throughput
+        workloads:
+          - name: dpi_pps
+            baseline: 2.19M
+          - name: dpi_bps
+            baseline: 20.55G

diff --git a/resources/ansible_roles/nDPI/tasks/main.yml b/resources/ansible_roles/nDPI/tasks/main.yml
index 6dc7bf9..ffe32c5 100644 (file)
--- 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 e067364..b00707e 100644 (file)
--- 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