From 6b9e62527829867f52a8d18efb09d85b76b35436 Mon Sep 17 00:00:00 2001 From: Stamatis Katsaounis Date: Thu, 24 Jan 2019 15:46:09 +0200 Subject: Add ONAP VVP Heat Template validation tests Change-Id: I9a3d56932ce41191901381831013768d1c57a749 Signed-off-by: Stamatis Katsaounis --- etc/conf/bottlenecks_config.yml | 1 + etc/conf/functest-k8s_config.yml | 1 + etc/conf/functest_config.yml | 1 + etc/conf/onap-vtp_config.yml | 1 + etc/conf/onap-vvp_config.yml | 20 ++++++++++++++++++++ etc/conf/vnftest_config.yml | 1 + etc/conf/yardstick_config.yml | 1 + etc/testcase/onap-vvp.validate.heat.yml | 16 ++++++++++++++++ etc/userconfig/env_config.sh.onap.sample | 8 ++++++++ 9 files changed, 50 insertions(+) create mode 100644 etc/conf/onap-vvp_config.yml create mode 100644 etc/testcase/onap-vvp.validate.heat.yml (limited to 'etc') diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml index 266fb2b6..8a0a39bc 100644 --- a/etc/conf/bottlenecks_config.yml +++ b/etc/conf/bottlenecks_config.yml @@ -20,6 +20,7 @@ bottlenecks: image_name: opnfv/bottlenecks docker_tag: latest opts: '-id --privileged=true' + shell: '/bin/bash' envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out -e CI_DEBUG={{debug}} -e BUILD_TAG={{build_tag}}-{{testcase}}' diff --git a/etc/conf/functest-k8s_config.yml b/etc/conf/functest-k8s_config.yml index 927af1d7..b5ad12b6 100644 --- a/etc/conf/functest-k8s_config.yml +++ b/etc/conf/functest-k8s_config.yml @@ -13,6 +13,7 @@ functest-k8s: image_name: opnfv/functest-kubernetes-healthcheck docker_tag: gambia opts: '-id' + shell: '/bin/bash' envs: '-e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO=k8-deploy -e NODE_NAME=unknown -e TEST_DB_URL=file:///home/opnfv/functest/results/functest_results.txt -e CI_DEBUG={{debug}} -e BUILD_TAG={{build_tag}}-{{testcase}}' diff --git a/etc/conf/functest_config.yml b/etc/conf/functest_config.yml index a7b00e60..bf637541 100644 --- a/etc/conf/functest_config.yml +++ b/etc/conf/functest_config.yml @@ -25,6 +25,7 @@ functest: image_name: opnfv/functest-smoke docker_tag: gambia opts: '-id --privileged=true' + shell: '/bin/bash' envs: '{{os_verify}} -e INSTALLER_TYPE=unknown -e DEPLOY_SCENARIO={{deploy_scenario}} -e NODE_NAME=unknown -e TEST_DB_URL=file://{{result_dir}}/functest_results.txt -e CI_DEBUG={{debug}} -e BUILD_TAG={{build_tag}}-{{testcase}}' diff --git a/etc/conf/onap-vtp_config.yml b/etc/conf/onap-vtp_config.yml index 85944c3b..72ebeab2 100644 --- a/etc/conf/onap-vtp_config.yml +++ b/etc/conf/onap-vtp_config.yml @@ -11,6 +11,7 @@ onap-vtp: image_name: nexus3.onap.org:10001/onap/cli docker_tag: 2.0.5 opts: '-td ' + shell: '/bin/bash' envs: '-e OPEN_CLI_MODE=daemon -e BUILD_TAG={{build_tag}}-{{testcase}} -e OPEN_CLI_PRODUCT_IN_USE=onap-vtp' volumes: diff --git a/etc/conf/onap-vvp_config.yml b/etc/conf/onap-vvp_config.yml new file mode 100644 index 00000000..a7d08ea8 --- /dev/null +++ b/etc/conf/onap-vvp_config.yml @@ -0,0 +1,20 @@ +--- + +{% set build_tag = build_tag or '' %} +{% set heat_templates_dir = heat_templates_dir or '' %} +{% set result_dir = '/reports' %} + +onap-vvp: + image_name: nexus3.onap.org:10001/onap/vvp/validation-scripts + docker_tag: latest + opts: '-td --entrypoint=""' + shell: '/bin/ash' + volumes: + - '-v {{heat_templates_dir}}:/template' + - '-v {{dovetail_home}}/results:{{result_dir}}' + pre_condition: + - 'echo this is pre_condition' + cmds: + - 'pytest --template-directory=/template --output-directory=/reports --report-format=json --continue-on-failure' + post_condition: + - 'echo this is post_condition' diff --git a/etc/conf/vnftest_config.yml b/etc/conf/vnftest_config.yml index 82e068b5..4104d763 100644 --- a/etc/conf/vnftest_config.yml +++ b/etc/conf/vnftest_config.yml @@ -3,6 +3,7 @@ vnftest: image_name: onap/vnfsdk/vnftest docker_tag: latest opts: '-id --privileged=true' + shell: '/bin/bash' config: dir: '/home/onap/userconfig' pre_condition: diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml index 8f3db551..e43989e2 100644 --- a/etc/conf/yardstick_config.yml +++ b/etc/conf/yardstick_config.yml @@ -24,6 +24,7 @@ yardstick: image_name: opnfv/yardstick docker_tag: latest opts: '-id --privileged=true' + shell: '/bin/bash' envs: "{{os_verify}} -e YARDSTICK_BRANCH=fraser -e CI_DEBUG={{debug}} -e BUILD_TAG={{build_tag}}-{{testcase}}" volumes: diff --git a/etc/testcase/onap-vvp.validate.heat.yml b/etc/testcase/onap-vvp.validate.heat.yml new file mode 100644 index 00000000..a4ca9ab6 --- /dev/null +++ b/etc/testcase/onap-vvp.validate.heat.yml @@ -0,0 +1,16 @@ +--- +onap-vvp.validate.heat: + name: onap-vvp.validate.heat + objective: onap heat template validation + validate: + type: onap-vvp + testcase: ice_validator + report: + source_archive_files: + - failures + - report.json + dest_archive_files: + - onap-vvp_logs/failures + - onap-vvp_logs/report.json + check_results_file: onap-vvp_logs/report.json + sub_testcase_list: diff --git a/etc/userconfig/env_config.sh.onap.sample b/etc/userconfig/env_config.sh.onap.sample index d983b469..5f7a2e61 100644 --- a/etc/userconfig/env_config.sh.onap.sample +++ b/etc/userconfig/env_config.sh.onap.sample @@ -1,4 +1,12 @@ +## Special environment parameters for TOSCA validation tests. + +# The url under which the VNF SDK container is accessible through the host. export HOST_URL="http://:8702" # Absolute path of CSAR file, and should be copied to vtp container. export CSAR_FILE="/opt/test.csar" + +## Special environment parameters for Heat validation tests. + +# The VNF directory should be put at $DOVETAIL_HOME/pre_config. +export VNF_DIRECTORY="/path/to/pre_config/vnf_dir" -- cgit 1.2.3-korg