From e37ce9db19fb583f60fc8d31a4093a8313ff47b8 Mon Sep 17 00:00:00 2001 From: Stamatis Katsaounis Date: Sat, 16 Feb 2019 19:48:58 +0200 Subject: Remove deprecated ONAP lifecycle test case This patch removes the ONAP lifecycle deprecated test case. Furthermore, it clears helper functions as well as unwanted configuration. Change-Id: Ib958457cf120ffb641a72be028d3a031741c44c6 Signed-off-by: Stamatis Katsaounis --- etc/compliance/onap.1.0.0.yml | 8 ------- etc/conf/dovetail_config.yml | 4 ---- etc/conf/vnftest_config.yml | 31 -------------------------- etc/testcase/onap.onap.vnf_lifecycle.yml | 16 -------------- etc/userconfig/vnf_descriptor.yaml.sample | 20 ----------------- etc/userconfig/vnftest_conf.yaml | 36 ------------------------------- 6 files changed, 115 deletions(-) delete mode 100644 etc/compliance/onap.1.0.0.yml delete mode 100644 etc/conf/vnftest_config.yml delete mode 100644 etc/testcase/onap.onap.vnf_lifecycle.yml delete mode 100644 etc/userconfig/vnf_descriptor.yaml.sample delete 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 deleted file mode 100644 index b7566b3f..00000000 --- a/etc/compliance/onap.1.0.0.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -onap.1.0.0: - name: onap.1.0.0 - version: '1.0.0' - vnf_type: tosca - testcases_list: - optional: - - onap.lifecycle.tc001 diff --git a/etc/conf/dovetail_config.yml b/etc/conf/dovetail_config.yml index cdad0554..72d7fda3 100644 --- a/etc/conf/dovetail_config.yml +++ b/etc/conf/dovetail_config.yml @@ -20,7 +20,6 @@ testsuite_supported: - ovp.2018.09 - onap.tosca.2019.04 - onap.heat.2019.04 - - onap.1.0.0 # used for testcase cmd template in jinja2 format # we have two variables available now @@ -31,6 +30,3 @@ parameters: path: '("name",)' - name: validate_testcase path: '("validate", "testcase")' - -include_config: - - vnftest_config.yml diff --git a/etc/conf/vnftest_config.yml b/etc/conf/vnftest_config.yml deleted file mode 100644 index 4104d763..00000000 --- a/etc/conf/vnftest_config.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -vnftest: - image_name: onap/vnfsdk/vnftest - docker_tag: latest - opts: '-id --privileged=true' - shell: '/bin/bash' - 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' - 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/onap.onap.vnf_lifecycle.yml b/etc/testcase/onap.onap.vnf_lifecycle.yml deleted file mode 100644 index 9bb928ce..00000000 --- a/etc/testcase/onap.onap.vnf_lifecycle.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -onap.onap.vnf_lifecycle: - name: onap.onap.vnf_lifecycle - objective: vnf lifecycle tests - validate: - type: vnftest - testcase: onap_vnftest_tc001 - report: - source_archive_files: - - vnftest.log - - onap.onap.vnf_lifecycle.out - dest_archive_files: - - onap_logs/onap.onap.vnf_lifecycle.log - - onap_logs/onap.onap.vnf_lifecycle.out - check_results_file: onap_logs/onap.onap.vnf_lifecycle.out - sub_testcase_list: diff --git a/etc/userconfig/vnf_descriptor.yaml.sample b/etc/userconfig/vnf_descriptor.yaml.sample deleted file mode 100644 index 98741768..00000000 --- a/etc/userconfig/vnf_descriptor.yaml.sample +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################## -# 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 deleted file mode 100644 index 781540bd..00000000 --- a/etc/userconfig/vnftest_conf.yaml +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################## -# 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