diff options
32 files changed, 154 insertions, 32 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/ci/report_config.yaml b/tests/ci/report_config.yaml new file mode 100644 index 000000000..ae19894c0 --- /dev/null +++ b/tests/ci/report_config.yaml @@ -0,0 +1,20 @@ +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 diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 16df3bb59..77a560c71 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -185,6 +185,10 @@ create_nova_flavor() 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 } @@ -195,10 +199,17 @@ load_cirros_image() 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" @@ -218,10 +229,17 @@ load_ubuntu_image() 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" @@ -270,6 +288,11 @@ load_yardstick_image() 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 \ 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/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml new file mode 100644 index 000000000..187e10988 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-fdio-noha_daily.yaml @@ -0,0 +1,30 @@ +--- +# 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 diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml index eb1226f80..29235b6f6 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-kvm-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml index 02fb31e47..fd48cadb1 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-kvm-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml index 27accf49c..b488505af 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-kvm_ovs-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-kvm_ovs-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml index cbb2069f9..93de7b88e 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-lxd-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml index cbbf8c13e..ac8535e81 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-lxd-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-lxd-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml index ebe7a0513..1ad871e51 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-nofeature-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml index 567e8bf73..e85a9788f 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-nofeature-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-nofeature-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml index 6cf5b38d3..a61d8242c 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-ovs-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml index 9e5074fc6..6c91a3337 100644 --- a/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-nosdn-ovs-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-nosdn-ovs-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml index 7106a1335..9ea030a40 100644 --- a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-ocl-nofeature-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml index 42781a841..e2f07650c 100644 --- a/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-ocl-nofeature-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-ocl-nofeature-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml index 84d630cc1..cd9c29268 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-bgpvpn-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml index a9e272aa6..0d4113e59 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-bgpvpn-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-bgpvpn-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml new file mode 100644 index 000000000..3b7fe80e5 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-fdio-noha_daily.yaml @@ -0,0 +1,30 @@ +--- +# 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 diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml index dadcb2f22..4a775b5bf 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-moon-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-moon-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml index 1de157a37..35358bcfe 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-nofeature-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml index 1661e08f1..dc8b2efd0 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-nofeature-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-nofeature-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml index 9e0e4186e..1899d407a 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-sfc-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml index 1ebd73216..33f24e332 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l2-sfc-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l2-sfc-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml index 4bcf81b45..97094bf32 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l3-nofeature-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml index c50569b69..2796dca05 100644 --- a/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-odl_l3-nofeature-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-odl_l3-nofeature-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml index 48718abb7..777565ae5 100644 --- a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-onos-nofeature-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml index 0e9ff81d9..e6745613b 100644 --- a/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-onos-nofeature-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-onos-nofeature-noha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml index bfb02cf48..aada4b450 100644 --- a/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-onos-sfc-ha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-onos-sfc-ha daily task suite schema: "yardstick:suite:0.1" diff --git a/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml index 2661e583e..a4e7c823f 100644 --- a/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml +++ b/tests/opnfv/test_suites/opnfv_os-onos-sfc-noha_daily.yaml @@ -1,5 +1,5 @@ --- -# Huawei US bare daily task suite +# os-onos-sfc-noha daily task suite schema: "yardstick:suite:0.1" 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\" \ }" } |