diff options
| -rw-r--r-- | dovetail/compliance/proposed_tests.yml | 2 | ||||
| -rw-r--r-- | dovetail/conf/bottlenecks_config.yml | 21 | ||||
| -rw-r--r-- | dovetail/conf/cmd_config.yml | 18 | ||||
| -rw-r--r-- | dovetail/conf/dovetail_config.yml | 2 | ||||
| -rw-r--r-- | dovetail/container.py | 4 | ||||
| -rw-r--r-- | dovetail/testcase/stress.tc001.yml (renamed from dovetail/testcase/resiliency.tc001.yml) | 4 |
6 files changed, 35 insertions, 16 deletions
diff --git a/dovetail/compliance/proposed_tests.yml b/dovetail/compliance/proposed_tests.yml index bae2375e..0f04acaa 100644 --- a/dovetail/compliance/proposed_tests.yml +++ b/dovetail/compliance/proposed_tests.yml @@ -12,3 +12,5 @@ proposed_tests: - dovetail.ha.tc011 # vnf - dovetail.vnf.tc001 + # stress + - dovetail.stress.tc001 diff --git a/dovetail/conf/bottlenecks_config.yml b/dovetail/conf/bottlenecks_config.yml index 43df8c55..f33e50f1 100644 --- a/dovetail/conf/bottlenecks_config.yml +++ b/dovetail/conf/bottlenecks_config.yml @@ -1,16 +1,29 @@ --- bottlenecks: image_name: opnfv/bottlenecks - docker_tag: cvp.0.4.0 + docker_tag: stable opts: '-id --privileged=true' config: dir: '/home/opnfv/userconfig' pre_condition: - - 'echo test for precondition in bottlenecks' + - 'source /tmp/admin_rc.sh && + (openstack --insecure image list | grep cirros-0.3.5 || + openstack --insecure image create cirros-0.3.5 + --disk-format qcow2 --container-format bare + --file /home/opnfv/userconfig/pre_config/cirros-0.3.5-x86_64-disk.img)' + - 'source /tmp/admin_rc.sh && + (openstack --insecure flavor list | grep yardstick-flavor || + openstack --insecure flavor create --id 100 + --ram 1024 --disk 3 --vcpus 1 yardstick-flavor)' cmds: - - '/home/opnfv/bottlenecks/run_tests.sh -c {{validate_testcase}}' + - 'python /home/opnfv/bottlenecks/testsuites/run_testsuite.py testcase {{validate_testcase}} True' post_condition: - - 'echo test for postcondition in bottlenecks' + - 'source /tmp/admin_rc.sh && + (! openstack --insecure image list | grep cirros-0.3.5 || + openstack --insecure image delete cirros-0.3.5)' + - 'source /tmp/admin_rc.sh && + (! openstack --insecure flavor list | grep yardstick-flavor || + openstack --insecure flavor delete yardstick-flavor)' result: dir: '/tmp' file_path: 'bottlenecks.log' diff --git a/dovetail/conf/cmd_config.yml b/dovetail/conf/cmd_config.yml index 2ae40df7..91a44b0b 100644 --- a/dovetail/conf/cmd_config.yml +++ b/dovetail/conf/cmd_config.yml @@ -21,21 +21,21 @@ cli: - '-y' path: - 'yardstick/docker_tag' - help: 'Overwrite tag for yardstick docker container (e.g. danube.3.2)' + help: 'Overwrite tag for yardstick docker container (e.g. opnfv-5.1.0)' func_tag: flags: - '--func_tag' - '-f' path: - 'functest/docker_tag' - help: 'Overwrite tag for functest docker container (e.g. ovp.1.0.0)' - # bott_tag: - # flags: - # - '--bott_tag' - # - '-b' - # path: - # - 'bottlenecks/docker_tag' - # help: 'Overwrite tag for bottlenecks docker container (e.g. cvp.0.4.0)' + help: 'Overwrite tag for functest docker container (e.g. euphrates)' + bott_tag: + flags: + - '--bott_tag' + - '-b' + path: + - 'bottlenecks/docker_tag' + help: 'Overwrite tag for bottlenecks docker container (e.g. stable)' control: testsuite: flags: diff --git a/dovetail/conf/dovetail_config.yml b/dovetail/conf/dovetail_config.yml index e3b58d9f..290798da 100644 --- a/dovetail/conf/dovetail_config.yml +++ b/dovetail/conf/dovetail_config.yml @@ -45,7 +45,7 @@ testarea_supported: - ipv6 - sdnvpn - vping - - resiliency + - stress - tempest - optional - mandatory diff --git a/dovetail/container.py b/dovetail/container.py index 4c0d8c33..8b4f0fcd 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -137,6 +137,10 @@ class Container(object): docker_vol = '-v /var/run/docker.sock:/var/run/docker.sock' env = ('-e Yardstick_TAG={} -e OUTPUT_FILE={}.out' .format(yard_tag, testcase_name)) + insecure = os.getenv("OS_INSECURE") + if insecure and insecure.lower() == 'true': + env = env + " -e OS_CACERT=False " + report = "" if dovetail_config['report_dest'].startswith("http"): report = ("-e BOTTLENECKS_DB_TARGET={}" diff --git a/dovetail/testcase/resiliency.tc001.yml b/dovetail/testcase/stress.tc001.yml index 86399849..fd29f276 100644 --- a/dovetail/testcase/resiliency.tc001.yml +++ b/dovetail/testcase/stress.tc001.yml @@ -1,6 +1,6 @@ --- -dovetail.resiliency.tc001: - name: dovetail.resiliency.tc001 +dovetail.stress.tc001: + name: dovetail.stress.tc001 objective: > # This test case verifies the ability of the SUT setting up VM pairs # for different tenants and providing acceptable capacity after the amount of # VM pairs reaches certain quantity. |