Remove neutron_trunk; networking_bgpvpn and networking_sfc

They were all merged in neutron-tempest-plugin.

Change-Id: Iefe3bf98fc41d0dab5a7cec640337c672a7b1a69
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit c22979393a734760105f73b75a5f90f4f9aecebc)

diff --git a/ansible/site.yml b/ansible/site.yml
index 31164d0..ac88118 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -64,9 +64,6 @@
             - tempest_scenario
             - tempest_slow
             - patrole
-            - neutron_trunk
-            - networking-bgpvpn
-            - networking-sfc
             - barbican
             - octavia
         - container: functest-benchmarking

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index aea1e05..7ee88e6 100644 (file)
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -211,61 +211,6 @@ tiers:
                             - 'network.test_agents_rbac'
                             - 'test_list_metadef_namespaces'
 
-            -
-                case_name: neutron_trunk
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the neutron trunk subtest of the
-                    OpenStack Tempest suite. The list of test cases is
-                    generated by Tempest having as input the relevant
-                    testcase list file.
-                run:
-                    name: tempest_common
-                    args:
-                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
-                        neutron_extensions:
-                            - trunk
-                            - trunk-details
-
-            -
-                case_name: networking-bgpvpn
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs OpenStack networking-bgpvpn Tempest
-                    suite. The list of test cases is generated by Tempest
-                    having as input the relevant regex.
-                run:
-                    name: tempest_common
-                    args:
-                        mode: '^neutron_tempest_plugin.bgpvpn.api\.'
-                        neutron_extensions:
-                            - bgpvpn
-                        option:
-                            - '--concurrency=3'
-
-            -
-                case_name: networking-sfc
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs OpenStack networking-sfc Tempest
-                    suite. The list of test cases is generated by Tempest
-                    having as input the relevant regex.
-                run:
-                    name: tempest_common
-                    args:
-                        mode:
-                            '^(?:neutron_tempest_plugin\.sfc\.tests\.api).*$'
-                        neutron_extensions:
-                            - sfc
-                        option:
-                            - '--concurrency=0'
-
             -
                 case_name: barbican
                 project_name: functest

diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index ed8dba6..2d0d587 100644 (file)
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -48,9 +48,6 @@ The internal test cases are:
  * tempest_slow
  * patrole
  * barbican
- * neutron_trunk
- * networking-bgpvpn
- * networking-sfc
  * octavia
  * rally_full
  * rally_jobs

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index bcda819..770eca2 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -389,61 +389,6 @@ tiers:
                             - 'network.test_agents_rbac'
                             - 'test_list_metadef_namespaces'
 
-            -
-                case_name: neutron_trunk
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the neutron trunk subtest of the
-                    OpenStack Tempest suite. The list of test cases is
-                    generated by Tempest having as input the relevant
-                    testcase list file.
-                run:
-                    name: tempest_common
-                    args:
-                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
-                        neutron_extensions:
-                            - trunk
-                            - trunk-details
-
-            -
-                case_name: networking-bgpvpn
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs OpenStack networking-bgpvpn Tempest
-                    suite. The list of test cases is generated by Tempest
-                    having as input the relevant regex.
-                run:
-                    name: tempest_common
-                    args:
-                        mode: '^neutron_tempest_plugin.bgpvpn.api\.'
-                        neutron_extensions:
-                            - bgpvpn
-                        option:
-                            - '--concurrency=3'
-
-            -
-                case_name: networking-sfc
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs OpenStack networking-sfc Tempest
-                    suite. The list of test cases is generated by Tempest
-                    having as input the relevant regex.
-                run:
-                    name: tempest_common
-                    args:
-                        mode:
-                            '^(?:neutron_tempest_plugin\.sfc\.tests\.api).*$'
-                        neutron_extensions:
-                            - sfc
-                        option:
-                            - '--concurrency=0'
-
             -
                 case_name: barbican
                 project_name: functest