Keep tests/data consistent with repository structure

- rename `benchmarks` in `tests/data` to `resources`
- delete obsoleted contents

JIRA: QTIP-258
Change-Id: I7f4ec1a1fc7b355922c7aee76851e7f0dd026f72
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

13 files changed, 6 insertions, 270 deletions

diff --git a/tests/conftest.py b/tests/conftest.py
index 343f3548..1bac60d0 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,8 +18,8 @@ def data_root():
 
 
 @pytest.fixture(scope='session')
-def benchmarks_root(data_root):
-    return path.join(data_root, 'benchmarks')
+def resources_root(data_root):
+    return path.join(data_root, 'resources')
 
 
 @pytest.fixture(scope='session')
diff --git a/tests/data/benchmarks/metric/dhrystone.yaml b/tests/data/benchmarks/metric/dhrystone.yaml
deleted file mode 100644
index e4d26248..00000000
--- a/tests/data/benchmarks/metric/dhrystone.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 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: dhrystone
-description: >
-  A synthetic computing benchmark program intended to be representative of
-  system (integer) programming.
-links:
-  - https://en.wikipedia.org/wiki/Dhrystone
-workloads:
-  - single_cpu
-  - multi_cpu
diff --git a/tests/data/benchmarks/metric/dpi.yaml b/tests/data/benchmarks/metric/dpi.yaml
deleted file mode 100644
index c90075d2..00000000
--- a/tests/data/benchmarks/metric/dpi.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 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: dpi
-description: deep packet inspection
-workloads:
-  - bps
-  - pps
diff --git a/tests/data/benchmarks/metric/fake-metric.yaml b/tests/data/benchmarks/metric/fake-metric.yaml
deleted file mode 100644
index dd2875d7..00000000
--- a/tests/data/benchmarks/metric/fake-metric.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 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: fake compute
-description: >
-  a fake compute performance index which generate random result
-workloads:  # all supported workloads
-  - fake_workload_1
-  - fake_workload_2
-  - fake_workload_3
diff --git a/tests/data/benchmarks/metric/ramspeed.yaml b/tests/data/benchmarks/metric/ramspeed.yaml
deleted file mode 100644
index e2e2b98f..00000000
--- a/tests/data/benchmarks/metric/ramspeed.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 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: ramspeed
-description: a memory performance benchmarking
-workloads:
-    - int: [add, average, copy, scale, triad]
-    - float: [add, average, copy, scale, triad]
diff --git a/tests/data/benchmarks/metric/ssl.yaml b/tests/data/benchmarks/metric/ssl.yaml
deleted file mode 100644
index 2b01dccd..00000000
--- a/tests/data/benchmarks/metric/ssl.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 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: ssl
-description: a Secure Sockets Layer performance benchmarking
-workloads:
-  - aes_128_cbc: [512, 1024, 2048, 4096]
-  - rsa_sig: [16, 64, 256, 1024, 8192]
diff --git a/tests/data/benchmarks/metric/whetstone.yaml b/tests/data/benchmarks/metric/whetstone.yaml
deleted file mode 100644
index 625ea87f..00000000
--- a/tests/data/benchmarks/metric/whetstone.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 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: whetstone
-description: >
-  A synthetic benchmark for evaluating the performance of computers.
-  The Whetstone benchmark primarily measures the floating-point arithmetic
-  performance.
-links:
-  - https://en.wikipedia.org/wiki/Whetstone_(benchmark)
-workloads:
-  - single_cpu
-  - multi_cpu
diff --git a/tests/data/benchmarks/plan/compute.yaml b/tests/data/benchmarks/plan/compute.yaml
deleted file mode 100644
index f4a7a2dc..00000000
--- a/tests/data/benchmarks/plan/compute.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-##############################################################################
-# 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/dpi/'
-      logs:
-        - filename: dpi_dump.txt
-          parsers:
-            - type: grep
-              regex: |-
-                ^\s+nDPI throughput:.+?(?P<pps>\d+.\d+)\sM\spps.+
-                ?(?P<bps>\d+.\d+)\sGb\/sec
-    - type: logfile
-      paths:
-        - '../../external/ramspeed/'
-      logs:
-        - filename: Intmem
-          parsers:
-            - type: grep
-              regex: '^INTEGER\s+BatchRun\s+Copy:\s+?(?P<integer_copy>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^INTEGER\s+BatchRun\s+Scale:\s+?(?P<integer_scale>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^INTEGER\s+BatchRun\s+Add:\s+?(?P<integer_add>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^INTEGER\s+BatchRun\s+Triad:\s+?(?P<integer_triad>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^INTEGER\s+BatchRun\s+AVERAGE:\s+?(?P<integer_average>\d+\.\d+)\sMB/s$'
-        - filename: Floatmem
-          parsers:
-            - type: grep
-              regex: '^FL-POINT\s+BatchRun\s+Copy:\s+?(?P<float_copy>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^FL-POINT\s+BatchRun\s+Scale:\s+?(?P<float_scale>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^FL-POINT\s+BatchRun\s+Add:\s+?(?P<float_add>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^FL-POINT\s+BatchRun\s+Triad:\s+?(?P<float_triad>\d+\.\d+)\sMB/s$'
-            - type: grep
-              regex: '^FL-POINT\s+BatchRun\s+AVERAGE:\s+?(?P<float_average>\d+\.\d+)\sMB/s$'
-    - type: logfile
-      paths:
-        - '../../external/ssl/'
-      logs:
-        - filename: RSA_dump
-          parsers:
-            - type: grep
-              regex: |-
-                ^rsa\s+512\sbits\s.+
-                ?(?P<rsa_sign_512>\d+\.\d)\s+
-                ?(?P<rsa_verify_512>\d+\.\d)$
-            - type: grep
-              regex: |-
-                ^rsa\s+1024\sbits\s.+
-                ?(?P<rsa_sign_1024>\d+\.\d)\s+
-                ?(?P<rsa_verify_1024>\d+\.\d)$
-            - type: grep
-              regex: |-
-                ^rsa\s+2048\sbits\s.+
-                ?(?P<rsa_sign_2048>\d+\.\d)\s+
-                ?(?P<rsa_verify_2048>\d+\.\d)$
-            - type: grep
-              regex: |-
-                ^rsa\s+4096\sbits\s.+
-                ?(?P<rsa_sign_4096>\d+\.\d)\s+
-                ?(?P<rsa_verify_4096>\d+\.\d)$
-        - filename: AES-128-CBC_dump
-          parsers:
-            - type: grep
-              regex: |-
-                ^aes-128-cbc\s+
-                ?(?P<aes_128_cbc_16_bytes>\d+\.\w+)\s+
-                ?(?P<aes_128_cbc_64_bytes>\d+\.\w+)\s+
-                ?(?P<aes_128_cbc_256_bytes>\d+\.\w+)\s+
-                ?(?P<aes_128_cbc_1024_bytes>\d+\.\w+)\s+
-                ?(?P<aes_128_cbc_8192_bytes>\d+\.\w+)$
-    - 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/data/benchmarks/plan/doctor.yaml b/tests/data/benchmarks/plan/doctor.yaml
deleted file mode 100644
index af995dac..00000000
--- a/tests/data/benchmarks/plan/doctor.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-# 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: doctor performance profiling
-description: create performance profile for OPNFV doctor notification time
-info:
-  facility: local
-  engineer: local
-config:
-  collectors:
-    - type: logfile
-      paths:
-        - '../../external/doctor-verify-apex-sample-master'
-      logs:
-        - filename: doctor_consumer.log
-          parsers:
-            - type: grep
-              regex: 'doctor consumer notified at (?P<notified>\d+(?:\.\d+)?)$'
-        - filename: doctor_inspector.log
-          parsers:
-            - type: grep
-              regex: 'event posted at (?P<event_posted>\d+(?:\.\d+)?)$'
-            - type: grep
-              regex: 'doctor mark vm\(.*\) error at (?P<vm_error>\d+(?:\.\d+)?)$'
-            - type: grep
-              regex: 'doctor mark host\(.*\) down at (?P<host_down>\d+(?:\.\d+)?)$'
-        - filename: disable_network.log
-          parsers:
-            - type: grep
-              regex: 'doctor set host down at (?P<network_down>\d+(?:\.\d+)?)$'
-  reporters:
-    - type: console
-      # transform collected data into timeline
-      transformer: timeline
-QPIs:
-  - fake_qpi.yaml
diff --git a/tests/data/benchmarks/plan/sample.yaml b/tests/data/benchmarks/plan/sample.yaml
deleted file mode 100644
index 04e8caf9..00000000
--- a/tests/data/benchmarks/plan/sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# 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: sample
-description: sample benchmark plan for testing default path
-config:
-  collectors: []
-  reporters: []
-QPIs: []
diff --git a/tests/data/benchmarks/QPI/compute.yaml b/tests/data/resources/QPI/compute.yaml
index 78a2d324..78a2d324 100644
--- a/tests/data/benchmarks/QPI/compute.yaml
+++ b/tests/data/resources/QPI/compute.yaml
diff --git a/tests/data/benchmarks/QPI/fake_qpi.yaml b/tests/data/resources/QPI/fake_qpi.yaml
index 4b34a495..4b34a495 100644
--- a/tests/data/benchmarks/QPI/fake_qpi.yaml
+++ b/tests/data/resources/QPI/fake_qpi.yaml
diff --git a/tests/unit/loader/qpi_test.py b/tests/unit/loader/qpi_test.py
index b53030d4..7fc8ce29 100644
--- a/tests/unit/loader/qpi_test.py
+++ b/tests/unit/loader/qpi_test.py
@@ -16,8 +16,8 @@ QPI_SPEC = 'compute.yaml'
 
 
 @pytest.fixture()
-def qpi_spec(benchmarks_root):
-    return QPISpec('compute.yaml', paths=[benchmarks_root])
+def qpi_spec(resources_root):
+    return QPISpec('compute.yaml', paths=[resources_root])
 
 
 def test_init(qpi_spec):
@@ -29,8 +29,8 @@ def test_init(qpi_spec):
         in str(excinfo.value)
 
 
-def test_list_all(benchmarks_root):
-    qpi_spec_list = list(QPISpec.list_all(paths=[benchmarks_root]))
+def test_list_all(resources_root):
+    qpi_spec_list = list(QPISpec.list_all(paths=[resources_root]))
     assert len(qpi_spec_list) is 2
     for item in qpi_spec_list:
         assert SpecProp.NAME in item