diff options
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml | 5 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml (renamed from samples/ping_k8s.yaml) | 0 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml (renamed from samples/container_ping_vm.yaml) | 2 | ||||
| -rw-r--r-- | tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml | 18 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/compute/computecapacity.bash | 13 | ||||
| -rw-r--r-- | yardstick/benchmark/scenarios/storage/storagecapacity.bash | 4 |
6 files changed, 30 insertions, 12 deletions
diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml index 58f5b783a..7f8c22943 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml @@ -18,13 +18,14 @@ description: > {% set provider = provider or none %} {% set physical_network = physical_network or 'physnet1' %} {% set segmentation_id = segmentation_id or none %} +{% set packetsize = packetsize or 100 %} scenarios: {% for i in range(2) %} - type: Ping options: - packetsize: 100 + packetsize: {{packetsize}} host: athena.demo target: ares.demo @@ -64,4 +65,4 @@ context: {% if segmentation_id %} segmentation_id: {{segmentation_id}} {% endif %} - {% endif %}
\ No newline at end of file + {% endif %} diff --git a/samples/ping_k8s.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml index 503fe6a45..503fe6a45 100644 --- a/samples/ping_k8s.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc080.yaml diff --git a/samples/container_ping_vm.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml index 4b7b64f68..d99757e47 100644 --- a/samples/container_ping_vm.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc081.yaml @@ -9,7 +9,7 @@ --- # Sample benchmark task config file -# measure network latency using ping in container +# measure network latency using ping betwwen container and VM schema: "yardstick:task:0.1" diff --git a/tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml b/tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml new file mode 100644 index 000000000..08a075845 --- /dev/null +++ b/tests/opnfv/test_suites/opnfv_k8-nosdn-lb-noha_daily.yaml @@ -0,0 +1,18 @@ +############################################################################## +# Copyright (c) 2017 Huawei Technologies Co.,Ltd 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 +############################################################################## +--- +# k8 nosdn lb noha daily task suite + +schema: "yardstick:suite:0.1" + +name: "k8-nosdn-lb-noha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc080.yaml diff --git a/yardstick/benchmark/scenarios/compute/computecapacity.bash b/yardstick/benchmark/scenarios/compute/computecapacity.bash index 68741a94f..d49638fe3 100644 --- a/yardstick/benchmark/scenarios/compute/computecapacity.bash +++ b/yardstick/benchmark/scenarios/compute/computecapacity.bash @@ -27,12 +27,11 @@ run_capacity() # Number of logical cores THREAD=$(grep 'processor' /proc/cpuinfo | sort -u | wc -l) # Total memory size - MEMORY=$(grep 'MemTotal' /proc/meminfo | sort -u) - ME=$(echo $MEMORY | awk '/ /{printf "%s %s", $2, $3}') + MEMORY=$(grep 'MemTotal' /proc/meminfo | sort -u | awk '{print $2}') + # Cache size per CPU - CACHE=$(grep 'cache size' /proc/cpuinfo | sort -u) - CA=$(echo $CACHE | awk '/ /{printf "%s", $4}') - CACHES=$[$CA * $CPU] + CACHE=$(grep 'cache size' /proc/cpuinfo | sort -u | awk '{print $4}') + CACHES=$[$CACHE * $CPU] HT_Value=$[$HT_Para * $CORES] if [ $HT_Value -eq $THREAD ]; then HT_OPEN=1 @@ -48,8 +47,8 @@ output_json() \"Cpu_number\":\"$CPU\", \ \"Core_number\":\"$CORES\", \ \"Thread_number\":\"$THREAD\", \ - \"Memory_size\": \"$ME\", \ - \"Cache_size\": \"$CACHES KB\", \ + \"Memory_size\": \"$MEMORY\", \ + \"Cache_size\": \"$CACHES\", \ \"HT_Open\": \"$HT_OPEN\" \ }" } diff --git a/yardstick/benchmark/scenarios/storage/storagecapacity.bash b/yardstick/benchmark/scenarios/storage/storagecapacity.bash index f963782d8..96db6e1be 100644 --- a/yardstick/benchmark/scenarios/storage/storagecapacity.bash +++ b/yardstick/benchmark/scenarios/storage/storagecapacity.bash @@ -17,7 +17,7 @@ OUTPUT_FILE=/tmp/storagecapacity-out.log # run disk_size test run_disk_size() { - fdisk -l | grep '^Disk.*bytes$' | awk -F [:,\ ] '{print $2,$7}' > $OUTPUT_FILE + fdisk -l | grep '^Disk.*bytes' | awk -F [:,\ ] '{print $2,$7}' > $OUTPUT_FILE } # write the disk size to stdout in json format @@ -35,7 +35,7 @@ output_disk_size() run_block_size() { echo -n "" > $OUTPUT_FILE - blkdevices=`fdisk -l | grep '^Disk.*bytes$' | awk -F [:,\ ] '{print $2}'` + blkdevices=`fdisk -l | grep '^Disk.*bytes' | awk -F [:,\ ] '{print $2}'` blkdevices=($blkdevices) for bd in "${blkdevices[@]}";do blk_size=`blockdev --getbsz $bd` |