diff options
32 files changed, 105 insertions, 451 deletions
diff --git a/docs/userguide/03-installation.rst b/docs/userguide/03-installation.rst index a3144ef2c..25c125851 100644 --- a/docs/userguide/03-installation.rst +++ b/docs/userguide/03-installation.rst @@ -251,3 +251,71 @@ More info about the tool can be found by executing: :: yardstick-plot -h + + +Deploy InfluxDB and Grafana locally +------------------------------------ + +.. pull docker images + +Pull docker images +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +:: + + docker pull tutum/influxdb + docker pull grafana/grafana + +Run influxdb and config +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Run influxdb +:: + + docker run -d --name influxdb -p 8083:8083 -p 8086:8086 --expose 8090 --expose 8099 tutum/influxdb + docker exec -it influxdb bash + +Config influxdb +:: + + influx + >CREATE USER root WITH PASSWORD 'root' WITH ALL PRIVILEGES + >CREATE DATABASE yardstick; + >use yardstick; + >show MEASUREMENTS; + +Run grafana and config +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +Run grafana +:: + + docker run -d --name grafana -p 3000:3000 grafana/grafana + +Config grafana +:: + + http://{YOUR_IP_HERE}:3000 + log on using admin/admin and config database resource to be {YOUR_IP_HERE}:8086 + +.. image:: images/Grafana_config.png + +Config yardstick conf +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +cp ./etc/yardstick/yardstick.conf.sample /etc/yardstick/yardstick.conf + +vi /etc/yardstick/yardstick.conf +Config yardstick.conf +:: + + [DEFAULT] + debug = True + dispatcher = influxdb + + [dispatcher_influxdb] + timeout = 5 + target = http://{YOUR_IP_HERE}:8086 + db_name = yardstick + username = root + password = root + +Now you can run yardstick test case and store the results in influxdb +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/userguide/images/Grafana_config.png b/docs/userguide/images/Grafana_config.png Binary files differnew file mode 100644 index 000000000..cb63098dc --- /dev/null +++ b/docs/userguide/images/Grafana_config.png diff --git a/plugin/CI/storperf.yaml b/plugin/CI/storperf.yaml index 4407ddf8c..65ebe51e1 100644 --- a/plugin/CI/storperf.yaml +++ b/plugin/CI/storperf.yaml @@ -8,6 +8,6 @@ plugins: name: storperf deployment: - ip: local + ip: 192.168.200.1 user: root password: root @@ -11,6 +11,7 @@ setup( 'benchmark/scenarios/availability/*.yaml', 'benchmark/scenarios/availability/attacker/*.yaml', 'benchmark/scenarios/availability/ha_tools/*.bash', + 'benchmark/scenarios/availability/ha_tools/*/*.bash', 'benchmark/scenarios/availability/attacker/scripts/*.bash', 'benchmark/scenarios/availability/monitor/*.yaml', 'benchmark/scenarios/availability/monitor/script_tools/*.bash', diff --git a/tests/ci/docker/yardstick-ci/Dockerfile b/tests/ci/docker/yardstick-ci/Dockerfile index 684f47122..da755d11d 100644 --- a/tests/ci/docker/yardstick-ci/Dockerfile +++ b/tests/ci/docker/yardstick-ci/Dockerfile @@ -20,6 +20,7 @@ ENV RELENG_REPO_DIR ${REPOS_DIR}/releng RUN apt-get update && apt-get install -y \ wget \ + expect \ curl \ git \ sshpass \ diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index 35118b12c..2c71c7c69 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -56,6 +56,11 @@ export EXTERNAL_NETWORK INSTALLER_TYPE DEPLOY_TYPE NODE_NAME # Prepare a admin-rc file for StorPerf integration $YARDSTICK_REPO_DIR/tests/ci/prepare_storperf_admin-rc.sh +# copy a admin-rc file for StorPerf integration to the deployment location +if [ "$NODE_NAME" == "huawei-pod1" ]; then + expect $YARDSTICK_REPO_DIR/tests/ci/scp_storperf_admin-rc.sh +fi + # Fetching id_rsa file from jump_server..." verify_connectivity() { local ip=$1 diff --git a/tests/ci/scp_storperf_admin-rc.sh b/tests/ci/scp_storperf_admin-rc.sh new file mode 100644 index 000000000..fd94aaa17 --- /dev/null +++ b/tests/ci/scp_storperf_admin-rc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/expect +set timeout 30 + +spawn scp -o StrictHostKeyChecking=no /root/storperf_admin-rc root@192.168.200.1:/root/storperf_admin-rc +expect "root@192.168.200.1's password: " +send "root\r" +interact diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index 8f67b9ffb..eafadf987 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -133,8 +133,21 @@ install_storperf() exit 1 fi + fi +} + +remove_storperf() +{ + # remove Storper from huawei-pod1 + if [ "$NODE_NAME" == "huawei-pod1" ]; then echo - echo "========== Installed storperf container ==========" + echo "========== Removing storperf ==========" + + if ! yardstick -d plugin remove plugin/CI/storperf.yaml; then + echo "Remove storperf plugin FAILED"; + exit 1 + fi + fi } @@ -428,6 +441,7 @@ main() install_storperf run_test + remove_storperf } main diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml index c0cff7d76..1942bb54f 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc002.yaml @@ -13,7 +13,7 @@ scenarios: runner: type: Duration - duration: 600 + duration: 60 interval: 10 sla: diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml index d506ccc1e..6dda2d436 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc074.yaml @@ -4,7 +4,7 @@ schema: "yardstick:task:0.1" {% set public_network = public_network or "ext-net" %} -{% set StorPerf_ip = StorPerf_ip or "192.168.200.2" %} +{% set StorPerf_ip = StorPerf_ip or "192.168.200.1" %} scenarios: - type: StorPerf diff --git a/tests/opnfv/test_suites/opnfv_ericsson-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson-pod1_daily.yaml deleted file mode 100644 index 66f2f8d98..000000000 --- a/tests/opnfv/test_suites/opnfv_ericsson-pod1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ERICSSON POD1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_ericsson_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_ericsson-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson-pod2_daily.yaml deleted file mode 100644 index c420271b8..000000000 --- a/tests/opnfv/test_suites/opnfv_ericsson-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ERICSSON POD2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_ericsson_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_ericsson-virtual1_daily.yaml b/tests/opnfv/test_suites/opnfv_ericsson-virtual1_daily.yaml deleted file mode 100644 index 62a5001ac..000000000 --- a/tests/opnfv/test_suites/opnfv_ericsson-virtual1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ERICSSON VIRTUAL1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_ericsson_virtual1_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml deleted file mode 100644 index 35eeb34a7..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod1_daily.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -# Huawei US bare daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc027.yaml -- - file_name: opnfv_yardstick_tc037.yaml -- - file_name: opnfv_yardstick_tc043.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml deleted file mode 100644 index 8a9ce4dc0..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod1_weekly.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -# Huawei US bare weekly task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_weekly" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc027.yaml -- - file_name: opnfv_yardstick_tc037.yaml -- - file_name: opnfv_yardstick_tc040.yaml -- - file_name: opnfv_yardstick_tc043.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod2_daily.yaml deleted file mode 100644 index 435d21c9e..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US bare daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml deleted file mode 100644 index 5569a0912..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod3_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei Shanghai bare daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml deleted file mode 100644 index 486425f1b..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-pod4_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ----
-# Huawei Shanghai bare POD6 daily task suite
-
-schema: "yardstick:suite:0.1"
-
-name: "opnfv_huawei_daily"
-test_cases_dir: "tests/opnfv/test_cases/"
-test_cases:
--
- file_name: opnfv_yardstick_tc002.yaml
--
- file_name: opnfv_yardstick_tc005.yaml
--
- file_name: opnfv_yardstick_tc010.yaml
--
- file_name: opnfv_yardstick_tc011.yaml
--
- file_name: opnfv_yardstick_tc012.yaml
--
- file_name: opnfv_yardstick_tc014.yaml
--
- file_name: opnfv_yardstick_tc037.yaml
diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual3_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml b/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml deleted file mode 100644 index bb87fc363..000000000 --- a/tests/opnfv/test_suites/opnfv_huawei-virtual4_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# Huawei US virtual daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_huawei_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod2_daily.yaml deleted file mode 100644 index 5191cae7a..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod5_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod5_daily.yaml deleted file mode 100644 index 824da2d35..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod5_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD5 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod6_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod6_daily.yaml deleted file mode 100644 index cf68e64f2..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod6_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD6 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_intel-pod8_daily.yaml b/tests/opnfv/test_suites/opnfv_intel-pod8_daily.yaml deleted file mode 100644 index 2e626c067..000000000 --- a/tests/opnfv/test_suites/opnfv_intel-pod8_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# INTEL POD8 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_intel_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_lf-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_lf-pod1_daily.yaml deleted file mode 100644 index 85147a00b..000000000 --- a/tests/opnfv/test_suites/opnfv_lf-pod1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# LF POD 1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_lf_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_lf-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_lf-pod2_daily.yaml deleted file mode 100644 index bda46c026..000000000 --- a/tests/opnfv/test_suites/opnfv_lf-pod2_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# LF POD 2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_lf_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/tests/opnfv/test_suites/opnfv_orange-pod2_daily.yaml b/tests/opnfv/test_suites/opnfv_orange-pod2_daily.yaml deleted file mode 100644 index 90b52e20c..000000000 --- a/tests/opnfv/test_suites/opnfv_orange-pod2_daily.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# Orange POD2 daily task suite - -schema: "yardstick:suite:0.1" - -name: "orange-pod2_daily" -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_tc005.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc037.yaml 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 8bf0c6578..ebe7a0513 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 @@ -102,7 +102,7 @@ test_cases: pod: huawei-pod1 task_args: huawei-pod1: '{"public_network": "ext-net", - "StorPerf_ip": "192.168.200.2"}' + "StorPerf_ip": "192.168.200.1"}' - file_name: opnfv_yardstick_tc075.yaml constraint: diff --git a/tests/opnfv/test_suites/opnfv_zte-pod1_daily.yaml b/tests/opnfv/test_suites/opnfv_zte-pod1_daily.yaml deleted file mode 100644 index 2a88f82fb..000000000 --- a/tests/opnfv/test_suites/opnfv_zte-pod1_daily.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# ZTE POD 1 daily task suite - -schema: "yardstick:suite:0.1" - -name: "opnfv_zte_daily" -test_cases_dir: "tests/opnfv/test_cases/" -test_cases: -- - file_name: opnfv_yardstick_tc002.yaml -- - file_name: opnfv_yardstick_tc005.yaml -- - file_name: opnfv_yardstick_tc010.yaml -- - file_name: opnfv_yardstick_tc011.yaml -- - file_name: opnfv_yardstick_tc012.yaml -- - file_name: opnfv_yardstick_tc014.yaml -- - file_name: opnfv_yardstick_tc037.yaml diff --git a/yardstick/benchmark/scenarios/availability/serviceha.py b/yardstick/benchmark/scenarios/availability/serviceha.py index aee94ee09..10f2c4f45 100755 --- a/yardstick/benchmark/scenarios/availability/serviceha.py +++ b/yardstick/benchmark/scenarios/availability/serviceha.py @@ -66,6 +66,10 @@ class ServiceHA(base.Scenario): LOG.info("monitor stop!") sla_pass = self.monitorMgr.verify_SLA() + if sla_pass: + result['sla_pass'] = 1 + else: + result['sla_pass'] = 0 assert sla_pass is True, "the test cases is not pass the SLA" return |
