summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorliang gao <jean.gaoliang@huawei.com>2016-09-20 07:46:14 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-20 07:46:14 +0000
commit18738b34abe226ff1a6a2d0dd7564737684c022e (patch)
treef812d49d9b30e4ee50b950ce902c5460ec4577b3 /tests
parentf28281f765cb1760a5bd371c8301d21f48c3ca2b (diff)
parent1dd6bfacd9eb90f74d85a764275b0c912c44dff3 (diff)
Merge "compute capacity description adjustment and HT check added"
Diffstat (limited to 'tests')
-rw-r--r--tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml10
-rw-r--r--tests/unit/benchmark/scenarios/compute/test_computecapacity.py2
2 files changed, 9 insertions, 3 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
index 403bc344e..54fc965c6 100644
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml
@@ -1,7 +1,13 @@
---
# Yardstick TC055 config file
-# Collect hardware specification from /proc/cpuinfo
-# Measure number of cores, number of threads, available memory size and cache size
+# Collect hardware specification from /proc/cpuinfo /proc/meminfo
+# compute capacity and scale.
+
+# the results have
+# number of CPUs, number of physical cores in a single CPU
+# number of logical cores, total memory size
+# cache size per CPU, total cache size
+# HT (Hyper-Thread) support status, 1 for open, 0 for close
schema: "yardstick:task:0.1"
{% set host = host or "node5.yardstick-TC055" %}
diff --git a/tests/unit/benchmark/scenarios/compute/test_computecapacity.py b/tests/unit/benchmark/scenarios/compute/test_computecapacity.py
index 660bb3391..da06b5dbb 100644
--- a/tests/unit/benchmark/scenarios/compute/test_computecapacity.py
+++ b/tests/unit/benchmark/scenarios/compute/test_computecapacity.py
@@ -20,7 +20,7 @@ from yardstick.benchmark.scenarios.compute import computecapacity
SAMPLE_OUTPUT = '{"Cpu_number": "2", "Core_number": "24",\
"Memory_size": "263753976 kB", "Thread_number": "48",\
- "Cache_size": "30720 KB"}'
+ "Cache_size": "30720 KB", "HT_Open": "0"}'
@mock.patch('yardstick.benchmark.scenarios.compute.computecapacity.ssh')