From f2d021c72b38845954755bab54aa13b4b2aad725 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 19 Jan 2017 16:58:46 +0800 Subject: Refactor loader classes - rename BaseLoader to YamlFileLoader as base class of QTIP specs loader - create an abstract BaseLoader - create FileLoader for logfile collector Change-Id: I0c992cd847fc0dce4fdd73a13c1cdbc406c84532 Signed-off-by: Yujun Zhang --- tests/data/benchmarks/plan/doctor.yaml | 37 ++++++++++++++++++++++++++++++++++ tests/data/opt/plan/doctor.yaml | 37 ---------------------------------- tests/unit/loader/plan_test.py | 2 +- 3 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 tests/data/benchmarks/plan/doctor.yaml delete mode 100644 tests/data/opt/plan/doctor.yaml (limited to 'tests') diff --git a/tests/data/benchmarks/plan/doctor.yaml b/tests/data/benchmarks/plan/doctor.yaml new file mode 100644 index 00000000..6c95077b --- /dev/null +++ b/tests/data/benchmarks/plan/doctor.yaml @@ -0,0 +1,37 @@ +name: doctor performance profiling +description: create performance profile for OPNFV doctor notification time +info: + facility: local + engineer: local +config: + driver: sample + collector: + - name: logfile + logs: + - filename: doctor_consumer.log + # 2016-12-28 03:16:05,630 consumer.py 26 INFO doctor consumer notified at 1482894965.63 + grep: + - regex: 'doctor consumer notified at \d+(\.\d+)?$' + capture: notified consumer + - filename: doctor_inspector.log + # 2016-12-28 03:16:05,299 inspector.py 76 INFO event posted at 1482894965.3 + # 2016-12-28 03:16:05,299 inspector.py 56 INFO doctor mark vm() error at 1482894965.3 + # 2016-12-28 03:16:05,506 inspector.py 66 INFO doctor mark host(overcloud-novacompute-1.ool-virtual1) down at 1482894965.51 + grep: + - regex: 'event posted at \d+(\.\d+)?$' + capture: posted event + - regex: 'doctor mark vm\(.*\) error at \d+(\.\d+)?$' + capture: marked VM error + - regex: 'doctor mark host\(.*\) down at \d+(\.\d+)?$' + capture: marked host down + - filename: disable_network.log + # doctor set host down at 1482894965.164096803 + grep: + - regex: 'doctor set host down at \d+(\.\d+)?$' + capture: set host down + reporter: + name: console + # transform collected data into timeline + transformer: timeline +QPIs: + - fake-qpi.yaml diff --git a/tests/data/opt/plan/doctor.yaml b/tests/data/opt/plan/doctor.yaml deleted file mode 100644 index 48b4c955..00000000 --- a/tests/data/opt/plan/doctor.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: doctor performance profiling -description: create performance profile for OPNFV doctor notification time -info: - facility: local - engineer: local -config: - driver: sample - collector: - - name: logfile - logs: - - filename: doctor_consumer.log - # 2016-12-28 03:16:05,630 consumer.py 26 INFO doctor consumer notified at 1482894965.63 - patterns: - - match: 'doctor consumer notified at \d+(\.\d+)?$' - capture: notified consumer - - filename: doctor_inspector.log - # 2016-12-28 03:16:05,299 inspector.py 76 INFO event posted at 1482894965.3 - # 2016-12-28 03:16:05,299 inspector.py 56 INFO doctor mark vm() error at 1482894965.3 - # 2016-12-28 03:16:05,506 inspector.py 66 INFO doctor mark host(overcloud-novacompute-1.ool-virtual1) down at 1482894965.51 - patterns: - - match: 'event posted at \d+(\.\d+)?$' - capture: posted event - - match: 'doctor mark vm\(.*\) error at \d+(\.\d+)?$' - capture: marked VM error - - match: 'doctor mark host\(.*\) down at \d+(\.\d+)?$' - capture: marked host down - - filename: disable_network.log - # doctor set host down at 1482894965.164096803 - patterns: - - match: 'doctor set host down at \d+(\.\d+)?$' - capture: set host down - reporter: - name: console - # transform collected data into timeline - transformer: timeline -QPIs: - - fake-qpi.yaml diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py index b57bcfb5..32837f8f 100644 --- a/tests/unit/loader/plan_test.py +++ b/tests/unit/loader/plan_test.py @@ -27,7 +27,7 @@ def test_init(plan): def test_list_all(benchmarks_root): plan_list = Plan.list_all(paths=[benchmarks_root]) - assert len(list(plan_list)) is 1 + assert len(list(plan_list)) is 2 for desc in plan_list: assert PlanProp.NAME in desc assert PlanProp.CONTENT in desc -- cgit 1.2.3-korg