bugfix: regex for dpi

see: https://build.opnfv.org/ci/view/qtip/job/
qtip-os-nosdn-kvm-ha-zte-pod3-daily-danube/3/console

Previous regex cann't match with log like:
"nDPI throughput:       943.34 K pps / 8.86 Gb/sec".
For pps, there are two type of unit: K and M.
Same with bps.

Change-Id: I247c8b6049cc8b264fe894538cd4f89ba544c0b8
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
(cherry picked from commit 6ee214ad9487dfaa121c72d8487464f63992c5ff)

diff --git a/qtip/collector/parser/regex.yaml b/qtip/collector/parser/regex.yaml
index 397f897..9427113 100644 (file)
--- a/qtip/collector/parser/regex.yaml
+++ b/qtip/collector/parser/regex.yaml
@@ -25,8 +25,8 @@ dpi:
   - filename: dpi_dump.txt
     grep:
       - |-
-          ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\sM\spps.+
-          ?(?P<bps>\d+.\d+)\sGb\/sec
+          ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\s.+\spps.+
+          ?(?P<bps>\d+.\d+)\s.+\/sec
 ramspeed:
   - filename: Intmem
     grep: