From dc644ae242f265410a9c6022d205a6b1b76cab8e Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Mon, 20 Feb 2017 15:59:00 +0800 Subject: 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 --- tests/data/benchmarks/plan/compute.yaml | 46 +++++++++++++++++++++++++++++++++ tests/unit/loader/plan_test.py | 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 tests/data/benchmarks/plan/compute.yaml (limited to 'tests') diff --git a/tests/data/benchmarks/plan/compute.yaml b/tests/data/benchmarks/plan/compute.yaml new file mode 100644 index 00000000..8529d8dc --- /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\d+\.\d)\sid' + - filename: inxi.log + parsers: + - type: grep + regex: '.+\s+Host:\s+(?P.+)\sKernel' + - type: grep + regex: '.+\sMemory:\s+(?P.+MB)\s' + - type: grep + regex: '^CPU\(s\):\s+(?P.+)' + - type: grep + regex: '.+\sDistro:\s+(?P.+)' + - type: grep + regex: '.+\sKernel:\s+(?P.+)\sConsole' + - type: grep + regex: '.+\s+HDD Total Size:\s+(?P.+)\s' + - type: grep + regex: '.+\sproduct:\s+(?P.+)\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 d9869cb6..70ae2ad5 100644 --- 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 -- cgit 1.2.3-korg