From 49d83d98a98a1c2bbf0784d0964c0250c3d9aae5 Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Wed, 14 Sep 2016 03:18:19 -0400
Subject: compute capacity description adjustment and HT check added

JIRA: YARDSTICK-270

1)description info amended according to really tested
2)hyper-thread status check added

Change-Id: I813a41ff1e55c2d816fa55b773cf6c4bdd2af2bd
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
(cherry picked from commit 1dd6bfacd9eb90f74d85a764275b0c912c44dff3)
---
 samples/computecapacity.yaml                                | 10 +++++++---
 tests/opnfv/test_cases/opnfv_yardstick_tc055.yaml           | 10 ++++++++--
 .../benchmark/scenarios/compute/test_computecapacity.py     |  2 +-
 yardstick/benchmark/scenarios/compute/computecapacity.bash  | 13 +++++++++++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/samples/computecapacity.yaml b/samples/computecapacity.yaml
index 006b3ef3d..ae527d2ca 100644
--- a/samples/computecapacity.yaml
+++ b/samples/computecapacity.yaml
@@ -1,8 +1,12 @@
 ---
 # Sample benchmark task config file
-# Measure compute capacity and scale.
-# Including number of cores, number of threads, available memory size and
-# cache size.
+# 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"
 
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')
diff --git a/yardstick/benchmark/scenarios/compute/computecapacity.bash b/yardstick/benchmark/scenarios/compute/computecapacity.bash
index 98d4b8fb5..68741a94f 100644
--- a/yardstick/benchmark/scenarios/compute/computecapacity.bash
+++ b/yardstick/benchmark/scenarios/compute/computecapacity.bash
@@ -9,13 +9,15 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Measure compute capacity and scale of a host
+# compute capacity and scale of a host
 
 set -e
 
 # run capacity test
 run_capacity()
 {
+    #parameter used for HT(Hyper-Thread) check
+    HT_Para=2
     # Number of CPUs
     CPU=$(grep 'physical id' /proc/cpuinfo | sort -u | wc -l)
     # Number of physical cores in a single CPU
@@ -31,6 +33,12 @@ run_capacity()
     CACHE=$(grep 'cache size' /proc/cpuinfo | sort -u)
     CA=$(echo $CACHE | awk '/ /{printf "%s", $4}')
     CACHES=$[$CA * $CPU]
+    HT_Value=$[$HT_Para * $CORES]
+    if [ $HT_Value -eq $THREAD ]; then
+        HT_OPEN=1
+    else
+        HT_OPEN=0
+    fi
 }
 
 # write the result to stdout in json format
@@ -41,7 +49,8 @@ output_json()
         \"Core_number\":\"$CORES\", \
         \"Thread_number\":\"$THREAD\", \
         \"Memory_size\": \"$ME\", \
-        \"Cache_size\": \"$CACHES KB\" \
+        \"Cache_size\": \"$CACHES KB\", \
+        \"HT_Open\": \"$HT_OPEN\" \
     }"
 }
 
-- 
cgit 1.2.3-korg