---
# 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"
--- /dev/null
+reporting:
+ -
+ name: apex
+ scenario:
+ -
+ os-nosdn-ovs-noha
+ -
+ os-onos-sfc-ha
+ -
+ os-onos-nofeature-ha
+
+ -
+ name: fuel
+ scenario:
+ -
+ os-odl_l2-sfc-noha
+ -
+ os-odl_l2-sfc-ha
+ -
+ os-nosdn-ovs-ha
if [[ "$DEPLOY_SCENARIO" == *"-ovs-"* ]]; then
nova flavor-key yardstick-flavor set hw:mem_page_size=large
fi
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ nova flavor-key yardstick-flavor set hw:mem_page_size=large
+ fi
fi
}
local image_file=/home/opnfv/images/cirros-0.3.3-x86_64-disk.img
+ EXTRA_PARAMS=""
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+ fi
+
output=$(glance image-create \
--name cirros-0.3.3 \
--disk-format $DISK_FORMAT \
--container-format bare \
+ $EXTRA_PARAMS \
--file $image_file)
echo "$output"
local ubuntu_image_file=/home/opnfv/images/trusty-server-cloudimg-amd64-disk1.img
+ EXTRA_PARAMS=""
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+ fi
+
output=$(glance image-create \
--name Ubuntu-14.04 \
--disk-format qcow2 \
--container-format bare \
+ $EXTRA_PARAMS \
--file $ubuntu_image_file)
echo "$output"
cd $YARDSTICK_REPO_DIR
fi
+ # VPP requires guest memory to be backed by large pages
+ if [[ "$DEPLOY_SCENARIO" == *"-fdio-"* ]]; then
+ EXTRA_PARAMS=$EXTRA_PARAMS" --property hw_mem_page_size=large"
+ fi
+
output=$(eval glance --os-image-api-version 1 image-create \
--name yardstick-trusty-server \
--is-public true --disk-format $DISK_FORMAT \
---
# 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" %}
--- /dev/null
+---
+# FDS suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-nosdn-fdio-noha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+ file_name: opnfv_yardstick_tc001.yaml
+-
+ file_name: opnfv_yardstick_tc002.yaml
+-
+ file_name: opnfv_yardstick_tc006.yaml
+-
+ file_name: opnfv_yardstick_tc007.yaml
+-
+ file_name: opnfv_yardstick_tc008.yaml
+-
+ file_name: opnfv_yardstick_tc009.yaml
+-
+ file_name: opnfv_yardstick_tc011.yaml
+-
+ file_name: opnfv_yardstick_tc020.yaml
+-
+ file_name: opnfv_yardstick_tc021.yaml
+-
+ file_name: opnfv_yardstick_tc037.yaml
+-
+ file_name: opnfv_yardstick_tc038.yaml
---
-# Huawei US bare daily task suite
+# os-nosdn-kvm-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-kvm-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-kvm_ovs-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-lxd-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-lxd-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-nofeature-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-nofeature-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-ovs-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-nosdn-ovs-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-ocl-nofeature-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-ocl-nofeature-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l2-bgpvpn-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l2-bgpvpn-noha daily task suite
schema: "yardstick:suite:0.1"
--- /dev/null
+---
+# FDS suite
+
+schema: "yardstick:suite:0.1"
+
+name: "os-odl_l2-fdio-noha"
+test_cases_dir: "tests/opnfv/test_cases/"
+test_cases:
+-
+ file_name: opnfv_yardstick_tc001.yaml
+-
+ file_name: opnfv_yardstick_tc002.yaml
+-
+ file_name: opnfv_yardstick_tc006.yaml
+-
+ file_name: opnfv_yardstick_tc007.yaml
+-
+ file_name: opnfv_yardstick_tc008.yaml
+-
+ file_name: opnfv_yardstick_tc009.yaml
+-
+ file_name: opnfv_yardstick_tc011.yaml
+-
+ file_name: opnfv_yardstick_tc020.yaml
+-
+ file_name: opnfv_yardstick_tc021.yaml
+-
+ file_name: opnfv_yardstick_tc037.yaml
+-
+ file_name: opnfv_yardstick_tc038.yaml
---
-# Huawei US bare daily task suite
+# os-odl_l2-moon-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l2-nofeature-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l2-nofeature-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l2-sfc-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l2-sfc-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l3-nofeature-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-odl_l3-nofeature-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-onos-nofeature-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-onos-nofeature-noha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-onos-sfc-ha daily task suite
schema: "yardstick:suite:0.1"
---
-# Huawei US bare daily task suite
+# os-onos-sfc-noha daily task suite
schema: "yardstick:suite:0.1"
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')
# 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
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
\"Core_number\":\"$CORES\", \
\"Thread_number\":\"$THREAD\", \
\"Memory_size\": \"$ME\", \
- \"Cache_size\": \"$CACHES KB\" \
+ \"Cache_size\": \"$CACHES KB\", \
+ \"HT_Open\": \"$HT_OPEN\" \
}"
}
Code Review / yardstick.git / commitdiff