From 698cd3f4246c4e472c306fcad57d8d7b6431333f Mon Sep 17 00:00:00 2001 From: Moshe Date: Sun, 4 Mar 2018 15:42:23 +0200 Subject: Integrate dovetail with ONAP Change-Id: I6a1fa5f27df2f5127eb00156b3135dc79caf5e77 Issue-ID: DOVETAIL-629 Signed-off-by: Moshe --- etc/compliance/onap.1.0.0.yml | 5 +++++ etc/conf/cmd_config.yml | 7 ++++++ etc/conf/dovetail_config.yml | 4 ++++ etc/conf/vnftest_config.yml | 31 ++++++++++++++++++++++++++ etc/testcase/lifecycle.tc001.yml | 9 ++++++++ etc/userconfig/vnf_descriptor.yaml.sample | 20 +++++++++++++++++ etc/userconfig/vnftest_conf.yaml | 36 +++++++++++++++++++++++++++++++ 7 files changed, 112 insertions(+) create mode 100644 etc/compliance/onap.1.0.0.yml create mode 100644 etc/conf/vnftest_config.yml create mode 100644 etc/testcase/lifecycle.tc001.yml create mode 100644 etc/userconfig/vnf_descriptor.yaml.sample create mode 100644 etc/userconfig/vnftest_conf.yaml (limited to 'etc') diff --git a/etc/compliance/onap.1.0.0.yml b/etc/compliance/onap.1.0.0.yml new file mode 100644 index 00000000..9bb4d2f9 --- /dev/null +++ b/etc/compliance/onap.1.0.0.yml @@ -0,0 +1,5 @@ +--- +onap.1.0.0: + name: onap.1.0.0 + testcases_list: + - dovetail.lifecycle.tc001 \ No newline at end of file diff --git a/etc/conf/cmd_config.yml b/etc/conf/cmd_config.yml index 4dbfbbc8..cd8bfe93 100644 --- a/etc/conf/cmd_config.yml +++ b/etc/conf/cmd_config.yml @@ -36,6 +36,13 @@ cli: path: - 'bottlenecks/docker_tag' help: 'Overwrite tag for bottlenecks docker container (e.g. stable)' + vnf_tag: + flags: + - '--vnf_tag' + - '-v' + path: + - 'vnftest/docker_tag' + help: 'Overwrite tag for vnftest docker container (e.g. beijing.0)' control: testsuite: flags: diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml index 464d046c..a77ac2af 100644 --- a/etc/conf/dovetail_config.yml +++ b/etc/conf/dovetail_config.yml @@ -35,6 +35,7 @@ testsuite_supported: - proposed_tests - debug - ovp.1.0.0 + - onap.1.0.0 # testarea supported, should adjust accordingly testarea_supported: - osinterop @@ -50,6 +51,7 @@ testarea_supported: - full - smoke - vnf + - lifecycle functest_testsuite: - refstack_defcore @@ -86,11 +88,13 @@ include_config: - functest_config.yml - yardstick_config.yml - bottlenecks_config.yml + - vnftest_config.yml test_project: - 'yardstick' - 'functest' - 'bottlenecks' + - 'vnftest' validate_input: valid_functest_tags: diff --git a/etc/conf/vnftest_config.yml b/etc/conf/vnftest_config.yml new file mode 100644 index 00000000..25a84c7b --- /dev/null +++ b/etc/conf/vnftest_config.yml @@ -0,0 +1,31 @@ +--- +vnftest: + image_name: onap/vnfsdk/vnftest + docker_tag: latest + opts: '-id --privileged=true' + config: + dir: '/home/onap/userconfig' + pre_condition: + - 'echo this is pre_condition' + cmds: + - 'mkdir -p /home/onap/vnftest/results/' + - "cd /home/onap/repos/vnftest && source /etc/vnftest/openstack.creds && + export CONF_FILE=/etc/vnftest/vnftest.yaml && + vnftest task start --output-file /home/onap/vnftest/results/{{testcase}}.out + /etc/vnftest/vnf_descriptor.yaml + tests/onap/test_cases/{{validate_testcase}}.yaml" + post_condition: + - 'echo this is post_condition' + result: + dir: '/home/onap/vnftest/results' + log: '/tmp/vnftest' + file_path: 'vnftest.log' + key_path: '/root/.ssh/id_rsa' + openrc: '/etc/vnftest/openstack.creds' + vnftest_conf: + - + src_file: '/home/opnfv/dovetail/pre_config/vnftest_conf.yaml' + dest_file: '/etc/vnftest/vnftest.yaml' + - + src_file: '/home/opnfv/dovetail/pre_config/vnf_descriptor.yaml' + dest_file: '/etc/vnftest/vnf_descriptor.yaml' diff --git a/etc/testcase/lifecycle.tc001.yml b/etc/testcase/lifecycle.tc001.yml new file mode 100644 index 00000000..f9c27985 --- /dev/null +++ b/etc/testcase/lifecycle.tc001.yml @@ -0,0 +1,9 @@ +--- +dovetail.lifecycle.tc001: + name: dovetail.lifecycle.tc001 + objective: vnf lifecycle tests + validate: + type: vnftest + testcase: onap_vnftest_tc001 + report: + sub_testcase_list: \ No newline at end of file diff --git a/etc/userconfig/vnf_descriptor.yaml.sample b/etc/userconfig/vnf_descriptor.yaml.sample new file mode 100644 index 00000000..98741768 --- /dev/null +++ b/etc/userconfig/vnf_descriptor.yaml.sample @@ -0,0 +1,20 @@ +############################################################################## +# Copyright 2018 EuropeanSoftwareMarketingLtd. +# =================================================================== +# Licensed under the ApacheLicense, Version2.0 (the"License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# software distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and limitations under +# the License +############################################################################## + +--- + +vnf_name: sample_firewall +type: CSAR +vnf_id: 123456 +csar_package_location: /home/opnfv/userconfig/pre_config/vFW_sample.csar \ No newline at end of file diff --git a/etc/userconfig/vnftest_conf.yaml b/etc/userconfig/vnftest_conf.yaml new file mode 100644 index 00000000..781540bd --- /dev/null +++ b/etc/userconfig/vnftest_conf.yaml @@ -0,0 +1,36 @@ +############################################################################## +# Copyright 2018 EuropeanSoftwareMarketingLtd. +# =================================================================== +# Licensed under the ApacheLicense, Version2.0 (the"License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# software distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and limitations under +# the License +############################################################################## + +dir: + conf: /etc/nvftest + repos: /home/vnftest/repos/vnftest + log: /tmp/vnftest + +file: + output_file: /tmp/vnftest.out + html_file: /tmp/vnftest.htm + reporting_file: /tmp/report.html + +component: + aai_ip: 10.247.43.140 + aai_port: 30202 + aai_ssl_port: 30233 + mso_ip: 10.247.43.140 + sdc_ip: 10.247.43.140 + sdc_port: 30205 + sdc_catalog_port: 30206 + sdc_designer_user: cs0008 + sdc_tester_user: jm0007 + sdc_governance_user: gv0001 + sdc_operations_user: op0001 \ No newline at end of file -- cgit 1.2.3-korg