Implement the collector regex for system info logfile.

I commented sone lines. Because these part can't be supported
well by grep_in_file().

Change-Id: Ifc0ab1b6f40180e40c150b2c80eeaa6c72274ac9
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

diff --git a/tests/data/benchmarks/plan/compute.yaml b/tests/data/benchmarks/plan/compute.yaml
new file mode 100644 (file)
index 0000000..8529d8d
--- /dev/null
+++ b/tests/data/benchmarks/plan/compute.yaml
@@ -0,0 +1,46 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+name: compute QPI
+description: compute QPI profile
+info:
+  facility: local
+  engineer: local
+config:
+  driver: ansible
+  collectors:
+    - type: logfile
+      paths:
+        - '../../external/sysinfo'
+      logs:
+        - filename: top.log
+          parsers:
+            - type: grep
+              regex: 'Cpu\(s\):.+?(?P<cpu_idle>\d+\.\d)\sid'
+        - filename: inxi.log
+          parsers:
+            - type: grep
+              regex: '.+\s+Host:\s+(?P<hostname>.+)\sKernel'
+            - type: grep
+              regex: '.+\sMemory:\s+(?P<memory>.+MB)\s'
+            - type: grep
+              regex: '^CPU\(s\):\s+(?P<cpu>.+)'
+            - type: grep
+              regex: '.+\sDistro:\s+(?P<os>.+)'
+            - type: grep
+              regex: '.+\sKernel:\s+(?P<kernel>.+)\sConsole'
+            - type: grep
+              regex: '.+\s+HDD Total Size:\s+(?P<disk>.+)\s'
+            - type: grep
+              regex: '.+\sproduct:\s+(?P<product>.+)\sversion'
+  reporter:
+    name: console
+    # transform collected data into timeline
+    transformer: timeline
+QPIs:
+  - compute.yaml

diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py
index d9869cb..70ae2ad 100644 (file)
--- a/tests/unit/loader/plan_test.py
+++ b/tests/unit/loader/plan_test.py
@@ -30,7 +30,7 @@ def test_init(plan):
 
 def test_list_all(benchmarks_root):
     plan_list = list(Plan.list_all(paths=[benchmarks_root]))
-    assert len(plan_list) is 1
+    assert len(plan_list) is 2
     for desc in plan_list:
         assert PlanProp.NAME in desc
         assert PlanProp.ABSPATH in desc