From 2bb4fd12a195f32357fafd8b11374118fc336d3c Mon Sep 17 00:00:00 2001 From: xudan Date: Mon, 13 May 2019 04:40:24 -0400 Subject: Remove sdnvpn test cases Functest removed test case 'bgpvpn' from scope of Hunter release. Also remove them from Dovetail for next release. The original link of refstack is invalid now. Changing it to interop link. Change-Id: I5b686496e106d688b8b3768401be95ac58fa2122 Signed-off-by: xudan --- etc/compliance/ovp.2018.09.yaml | 54 ---------------------- etc/compliance/ovp.2019.0x.yaml | 50 ++++++++++++++++++++ .../functest.bgpvpn.router_association.yml | 28 ----------- ...ctest.bgpvpn.router_association_floating_ip.yml | 28 ----------- .../functest.bgpvpn.subnet_connectivity.yml | 28 ----------- etc/testcase/functest.bgpvpn.tenant_separation.yml | 28 ----------- etc/userconfig/bgpvpn_testcases.yaml | 27 ----------- etc/userconfig/sdnvpn_config_tc000.yaml | 16 ------- etc/userconfig/sdnvpn_config_testcase1.yaml | 36 --------------- etc/userconfig/sdnvpn_config_testcase2.yaml | 46 ------------------ etc/userconfig/sdnvpn_config_testcase3.yaml | 35 -------------- etc/userconfig/sdnvpn_config_testcase4.yaml | 36 --------------- etc/userconfig/sdnvpn_config_testcase8.yaml | 32 ------------- 13 files changed, 50 insertions(+), 394 deletions(-) delete mode 100644 etc/compliance/ovp.2018.09.yaml create mode 100644 etc/compliance/ovp.2019.0x.yaml delete mode 100644 etc/testcase/functest.bgpvpn.router_association.yml delete mode 100644 etc/testcase/functest.bgpvpn.router_association_floating_ip.yml delete mode 100644 etc/testcase/functest.bgpvpn.subnet_connectivity.yml delete mode 100644 etc/testcase/functest.bgpvpn.tenant_separation.yml delete mode 100644 etc/userconfig/bgpvpn_testcases.yaml delete mode 100644 etc/userconfig/sdnvpn_config_tc000.yaml delete mode 100644 etc/userconfig/sdnvpn_config_testcase1.yaml delete mode 100644 etc/userconfig/sdnvpn_config_testcase2.yaml delete mode 100644 etc/userconfig/sdnvpn_config_testcase3.yaml delete mode 100644 etc/userconfig/sdnvpn_config_testcase4.yaml delete mode 100644 etc/userconfig/sdnvpn_config_testcase8.yaml (limited to 'etc') diff --git a/etc/compliance/ovp.2018.09.yaml b/etc/compliance/ovp.2018.09.yaml deleted file mode 100644 index f0e99199..00000000 --- a/etc/compliance/ovp.2018.09.yaml +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -ovp.2018.09: - name: ovp.2018.09 - version: '2018.09' - testcases_list: - mandatory: - - functest.vping.userdata - - functest.vping.ssh - - functest.tempest.osinterop - - functest.tempest.compute - - functest.tempest.identity_v3 - - functest.tempest.image - - functest.tempest.network_api - - functest.tempest.volume - - functest.tempest.neutron_trunk_ports - - functest.tempest.ipv6_api - - functest.security.patrole - - yardstick.ha.nova_api - - yardstick.ha.neutron_server - - yardstick.ha.keystone - - yardstick.ha.glance_api - - yardstick.ha.cinder_api - - yardstick.ha.cpu_load - - yardstick.ha.disk_load - - yardstick.ha.haproxy - - yardstick.ha.rabbitmq - - yardstick.ha.database - - bottlenecks.stress.ping - optional: - - functest.tempest.ipv6_scenario - - functest.tempest.multi_node_scheduling - - functest.tempest.network_security - - functest.tempest.vm_lifecycle - - functest.tempest.network_scenario - - functest.tempest.bgpvpn - - functest.security.patrole_vxlan_dependent - - functest.bgpvpn.subnet_connectivity - - functest.bgpvpn.tenant_separation - - functest.bgpvpn.router_association - - functest.bgpvpn.router_association_floating_ip - - yardstick.ha.neutron_l3_agent - - yardstick.ha.controller_restart - - functest.vnf.vims - - functest.vnf.vepc - - functest.snaps.smoke diff --git a/etc/compliance/ovp.2019.0x.yaml b/etc/compliance/ovp.2019.0x.yaml new file mode 100644 index 00000000..53467354 --- /dev/null +++ b/etc/compliance/ovp.2019.0x.yaml @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2019 opnfv. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- +ovp.2018.09: + name: ovp.2018.09 + version: '2018.09' + testcases_list: + mandatory: + - functest.vping.userdata + - functest.vping.ssh + - functest.tempest.osinterop + - functest.tempest.compute + - functest.tempest.identity_v3 + - functest.tempest.image + - functest.tempest.network_api + - functest.tempest.volume + - functest.tempest.neutron_trunk_ports + - functest.tempest.ipv6_api + - functest.security.patrole + - yardstick.ha.nova_api + - yardstick.ha.neutron_server + - yardstick.ha.keystone + - yardstick.ha.glance_api + - yardstick.ha.cinder_api + - yardstick.ha.cpu_load + - yardstick.ha.disk_load + - yardstick.ha.haproxy + - yardstick.ha.rabbitmq + - yardstick.ha.database + - bottlenecks.stress.ping + optional: + - functest.tempest.ipv6_scenario + - functest.tempest.multi_node_scheduling + - functest.tempest.network_security + - functest.tempest.vm_lifecycle + - functest.tempest.network_scenario + - functest.tempest.bgpvpn + - functest.security.patrole_vxlan_dependent + - yardstick.ha.neutron_l3_agent + - yardstick.ha.controller_restart + - functest.vnf.vims + - functest.vnf.vepc + - functest.snaps.smoke diff --git a/etc/testcase/functest.bgpvpn.router_association.yml b/etc/testcase/functest.bgpvpn.router_association.yml deleted file mode 100644 index b0fc01dd..00000000 --- a/etc/testcase/functest.bgpvpn.router_association.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -functest.bgpvpn.router_association: - name: functest.bgpvpn.router_association - objective: VPN provides connectivity between subnets using association of Neutron Router to VPNs - validate: - type: functest - testcase: bgpvpn - image_name: opnfv/functest-features - pre_condition: - - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' - - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase4.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' - report: - source_archive_files: - - functest.log - dest_archive_files: - - bgpvpn_logs/functest.bgpvpn.router_association.log - check_results_files: - - 'functest_results.txt' - sub_testcase_list: diff --git a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml b/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml deleted file mode 100644 index 9deaea51..00000000 --- a/etc/testcase/functest.bgpvpn.router_association_floating_ip.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -functest.bgpvpn.router_association_floating_ip: - name: functest.bgpvpn.router_association_floating_ip - objective: associate Neutron Router with an attached subnet to a VPN and verify reachability of the Floating IP - validate: - type: functest - testcase: bgpvpn - image_name: opnfv/functest-features - pre_condition: - - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' - - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase8.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' - report: - source_archive_files: - - functest.log - dest_archive_files: - - bgpvpn_logs/functest.bgpvpn.router_association_floating_ip.log - check_results_files: - - 'functest_results.txt' - sub_testcase_list: diff --git a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml b/etc/testcase/functest.bgpvpn.subnet_connectivity.yml deleted file mode 100644 index a092842d..00000000 --- a/etc/testcase/functest.bgpvpn.subnet_connectivity.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -functest.bgpvpn.subnet_connectivity: - name: functest.bgpvpn.subnet_connectivity - objective: Connectivity between Neutron subnets through association of Neutron Networks to VPNs - validate: - type: functest - testcase: bgpvpn - image_name: opnfv/functest-features - pre_condition: - - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' - - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase1.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' - report: - source_archive_files: - - functest.log - dest_archive_files: - - bgpvpn_logs/functest.bgpvpn.subnet_connectivity.log - check_results_files: - - 'functest_results.txt' - sub_testcase_list: diff --git a/etc/testcase/functest.bgpvpn.tenant_separation.yml b/etc/testcase/functest.bgpvpn.tenant_separation.yml deleted file mode 100644 index 096a3816..00000000 --- a/etc/testcase/functest.bgpvpn.tenant_separation.yml +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -functest.bgpvpn.tenant_separation: - name: functest.bgpvpn.tenant_separation - objective: Separation of tenant networks through association to different VPNs - validate: - type: functest - testcase: bgpvpn - image_name: opnfv/functest-features - pre_condition: - - 'cp /home/opnfv/userconfig/bgpvpn_testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml' - - 'cp /home/opnfv/userconfig/sdnvpn_config_testcase2.yaml /usr/lib/python2.7/site-packages/sdnvpn/test/functest/config.yaml' - report: - source_archive_files: - - functest.log - dest_archive_files: - - bgpvpn_logs/functest.bgpvpn.tenant_separation.log - check_results_files: - - 'functest_results.txt' - sub_testcase_list: diff --git a/etc/userconfig/bgpvpn_testcases.yaml b/etc/userconfig/bgpvpn_testcases.yaml deleted file mode 100644 index e5acb1b8..00000000 --- a/etc/userconfig/bgpvpn_testcases.yaml +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - ---- -tiers: - - - name: features - order: 2 - description: >- - Test suites from feature projects - integrated in functest - testcases: - - - case_name: bgpvpn - project_name: sdnvpn - criteria: 100 - blocking: false - description: >- - Test suite from SDNVPN project. - run: - name: bgpvpn diff --git a/etc/userconfig/sdnvpn_config_tc000.yaml b/etc/userconfig/sdnvpn_config_tc000.yaml deleted file mode 100644 index dfa1547d..00000000 --- a/etc/userconfig/sdnvpn_config_tc000.yaml +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -defaults: - flavor: m1.tiny # adapt to your environment - -testcases: - sdnvpn.test.functest.run_tempest: - enabled: true - description: Neutron BGPVPN tests in tempest diff --git a/etc/userconfig/sdnvpn_config_testcase1.yaml b/etc/userconfig/sdnvpn_config_testcase1.yaml deleted file mode 100644 index 95eb0f43..00000000 --- a/etc/userconfig/sdnvpn_config_testcase1.yaml +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -defaults: - flavor: m1.tiny # adapt to your environment - -testcases: - sdnvpn.test.functest.testcase_1: - enabled: true - description: VPN provides connectivity between subnets - testname_db: functest_testcase_1 - instance_1_name: sdnvpn-1-1 - instance_2_name: sdnvpn-1-2 - instance_3_name: sdnvpn-1-3 - instance_4_name: sdnvpn-1-4 - instance_5_name: sdnvpn-1-5 - image_name: sdnvpn-image - net_1_name: sdnvpn-1-1-net - subnet_1_name: sdnvpn-1-1-subnet - subnet_1_cidr: 10.10.10.0/24 - router_1_name: sdnvpn-1-1-router - net_2_name: sdnvpn-1-2-net - subnet_2_name: sdnvpn-1-2-subnet - subnet_2_cidr: 10.10.11.0/24 - router_2_name: sdnvpn-1-2-router - secgroup_name: sdnvpn-sg - secgroup_descr: Security group for SDNVPN test cases - targets1: '88:88' - targets2: '55:55' - route_distinguishers: '11:11' diff --git a/etc/userconfig/sdnvpn_config_testcase2.yaml b/etc/userconfig/sdnvpn_config_testcase2.yaml deleted file mode 100644 index 9e614a96..00000000 --- a/etc/userconfig/sdnvpn_config_testcase2.yaml +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -defaults: - flavor: m1.tiny # adapt to your environment - -testcases: - sdnvpn.test.functest.testcase_2: - enabled: true - description: Tenant separation - testname_db: functest_testcase_2 - instance_1_name: sdnvpn-2-1 - instance_2_name: sdnvpn-2-2 - instance_3_name: sdnvpn-2-3 - instance_4_name: sdnvpn-2-4 - instance_5_name: sdnvpn-2-5 - instance_1_ip: 10.10.10.11 - instance_2_ip: 10.10.10.12 - instance_3_ip: 10.10.11.13 - instance_4_ip: 10.10.10.12 - instance_5_ip: 10.10.11.13 - image_name: sdnvpn-image - net_1_name: sdnvpn-2-1-net - subnet_1a_name: sdnvpn-2-1a-subnet - subnet_1a_cidr: 10.10.10.0/24 - subnet_1b_name: sdnvpn-2-1b-subnet - subnet_1b_cidr: 10.10.11.0/24 - router_1_name: sdnvpn-2-1-router - net_2_name: sdnvpn-2-2-net - subnet_2a_name: sdnvpn-2-2a-subnet - subnet_2a_cidr: 10.10.11.0/24 - subnet_2b_name: sdnvpn-2-2b-subnet - subnet_2b_cidr: 10.10.10.0/24 - router_2_name: sdnvpn-2-2-router - secgroup_name: sdnvpn-sg - secgroup_descr: Security group for SDNVPN test cases - targets1: '88:88' - targets2: '55:55' - route_distinguishers1: '111:111' - route_distinguishers2: '222:222' diff --git a/etc/userconfig/sdnvpn_config_testcase3.yaml b/etc/userconfig/sdnvpn_config_testcase3.yaml deleted file mode 100644 index e1ccc0d7..00000000 --- a/etc/userconfig/sdnvpn_config_testcase3.yaml +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -defaults: - flavor: m1.tiny # adapt to your environment - -testcases: - sdnvpn.test.functest.testcase_3: - enabled: true - description: Data center gateway integration - testname_db: functest_testcase_3 - secgroup_name: sdnvpn-sg - secgroup_descr: Security group for SDNVPN test cases - image_name: sdnvpn-image - ubuntu_image_name: sdnvpn-ubuntu-image - net_1_name: sdnvpn-3-1-net - subnet_1_name: sdnvpn-3-1-subnet - subnet_1_cidr: 10.10.10.0/24 - router_1_name: sdnvpn-3-1-router - quagga_net_name: sdnvpn-3-2-quagga-net - quagga_subnet_name: sdnvpn-3-2-quagga-subnet - quagga_subnet_cidr: 10.10.11.0/24 - quagga_router_name: sdnvpn-3-2-quagga-router - quagga_instance_name: sdnvpn-3-2-quagga - quagga_instance_ip: 10.10.11.5 - instance_1_name: sdnvpn-3-1 - instance_1_ip: 10.10.10.5 - import_targets: '31:31' - export_targets: '32:32' diff --git a/etc/userconfig/sdnvpn_config_testcase4.yaml b/etc/userconfig/sdnvpn_config_testcase4.yaml deleted file mode 100644 index 42554952..00000000 --- a/etc/userconfig/sdnvpn_config_testcase4.yaml +++ /dev/null @@ -1,36 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -defaults: - flavor: m1.tiny # adapt to your environment - -testcases: - sdnvpn.test.functest.testcase_4: - enabled: true - description: VPN provides connectivity between subnets using router association - testname_db: functest_testcase_4 - instance_1_name: sdnvpn-4-1 - instance_2_name: sdnvpn-4-2 - instance_3_name: sdnvpn-4-3 - instance_4_name: sdnvpn-4-4 - instance_5_name: sdnvpn-4-5 - image_name: sdnvpn-image - net_1_name: sdnvpn-4-1-net - subnet_1_name: sdnvpn-4-1-subnet - subnet_1_cidr: 10.10.10.0/24 - router_1_name: sdnvpn-4-1-router - net_2_name: sdnvpn-4-2-net - subnet_2_name: sdnvpn-4-2-subnet - subnet_2_cidr: 10.10.11.0/24 - router_2_name: sdnvpn-4-2-router - secgroup_name: sdnvpn-sg - secgroup_descr: Security group for SDNVPN test cases - targets1: '88:88' - targets2: '55:55' - route_distinguishers: '12:12' diff --git a/etc/userconfig/sdnvpn_config_testcase8.yaml b/etc/userconfig/sdnvpn_config_testcase8.yaml deleted file mode 100644 index 073f45f9..00000000 --- a/etc/userconfig/sdnvpn_config_testcase8.yaml +++ /dev/null @@ -1,32 +0,0 @@ -############################################################################## -# Copyright (c) 2019 opnfv. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -defaults: - flavor: m1.tiny # adapt to your environment - -testcases: - sdnvpn.test.functest.testcase_8: - enabled: true - description: Test floating IP and router assoc coexistence - testname_db: functest_testcase_8 - image_name: sdnvpn-image - instance_1_name: sdnvpn-8-1 - instance_2_name: sdnvpn-8-2 - net_1_name: sdnvpn-8-1 - subnet_1_name: sdnvpn-8-1-subnet - subnet_1_cidr: 10.10.10.0/24 - router_1_name: sdnvpn-8-1-router - net_2_name: sdnvpn-8-2 - subnet_2_name: sdnvpn-8-2-subnet - subnet_2_cidr: 10.10.20.0/24 - router_2_name: sdnvpn-8-2-router - secgroup_name: sdnvpn-sg - secgroup_descr: Security group for SDNVPN test cases - targets: '88:88' - route_distinguishers: '18:18' -- cgit 1.2.3-korg