diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2017-02-21 11:49:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-21 11:49:43 +0000 |
| commit | a95ed75274a7f98e8988bfbf521c29c9da021fa2 (patch) | |
| tree | ee6ac2d5344acb865fac25ef699ea641530439b4 | |
| parent | ac28684fd2fe68d8796f0b46da72e2e6199d1b7e (diff) | |
| parent | dc644ae242f265410a9c6022d205a6b1b76cab8e (diff) | |
Merge "Implement the collector regex for system info logfile."
| -rw-r--r-- | tests/data/benchmarks/plan/compute.yaml | 46 | ||||
| -rw-r--r-- | tests/unit/loader/plan_test.py | 2 |
2 files changed, 47 insertions, 1 deletions
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<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 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 |