diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/ci/load_images.sh | 8 | ||||
| -rw-r--r-- | tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml | 9 | ||||
| -rw-r--r-- | tests/unit/dispatcher/test_influxdb.py | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 2e22b83c2..487f33e33 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -145,12 +145,6 @@ load_yardstick_image() exit 1 fi - if [[ "$DEPLOY_SCENARIO" == *"-lxd-"* ]]; then - sudo rm -f -- "${RAW_IMAGE}" - else - sudo rm -f -- "${QCOW_IMAGE}" - fi - echo "Glance image id: $GLANCE_IMAGE_ID" } @@ -225,7 +219,7 @@ create_nova_flavor() echo echo "========== Creating yardstick-flavor ==========" # Create the nova flavor used by some sample test cases - openstack flavor create --id 100 --ram 512 --disk 3 --vcpus 1 yardstick-flavor + openstack flavor create --id 100 --ram 1024 --disk 3 --vcpus 1 yardstick-flavor # DPDK-enabled OVS requires guest memory to be backed by large pages if [[ $DEPLOY_SCENARIO == *[_-]ovs[_-]* ]]; then openstack flavor set --property hw:mem_page_size=large yardstick-flavor diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml index 443395873..c4ee237e5 100644 --- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml +++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml @@ -11,16 +11,22 @@ schema: "yardstick:task:0.1" description: > Sample test case for the HA of OpenStack Controll Node abnormally shutdown. + In order to power on the shutdown node after testing, the jumphost is + required to install ipmitool. Ipmi jumphost info and each nodes' ipmi ip, + username, password are needed in pod file (There is a sample pod file in + "etc/yardstick/nodes/pod.yaml.ipmi.sample"). {% set file = file or 'etc/yardstick/nodes/fuel_virtual/pod.yaml' %} +{% set jumphost = jumphost or 'node0' %} scenarios: - type: ServiceHA options: attackers: - - fault_type: "host-shutdown" + - fault_type: "bare-metal-down" host: node1 + jump_host: {{jumphost}} monitors: - monitor_type: "openstack-cmd" @@ -42,6 +48,7 @@ scenarios: nodes: node1: node1.LF + node0: node0.LF runner: type: Iteration diff --git a/tests/unit/dispatcher/test_influxdb.py b/tests/unit/dispatcher/test_influxdb.py index 0c7b58135..dca3c4189 100644 --- a/tests/unit/dispatcher/test_influxdb.py +++ b/tests/unit/dispatcher/test_influxdb.py @@ -14,11 +14,15 @@ from __future__ import absolute_import import unittest + try: from unittest import mock except ImportError: import mock +from yardstick import _init_logging +_init_logging() + from yardstick.dispatcher.influxdb import InfluxdbDispatcher |