From 13e4c5838b732bf9fd246cd4f97cb9b4e2b8e0b9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Sun, 15 Apr 2018 11:11:50 +0200
Subject: [PATCH] Remove odl_netvirt testcase
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Its dendencies have not been met since Danube [1].

[1] https://build.opnfv.org/ci/job/apex-os-odl_l3-nofeature-noha-baremetal-danube/

Change-Id: I1a5bb4acd9e7e14dbf519132847521b5138f4cd6
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/smoke/testcases.yaml                     | 22 ----------------------
 docs/release/release-notes/functest-release.rst |  1 -
 docs/testing/developer/devguide/index.rst       |  3 +--
 docs/testing/user/configguide/configguide.rst   |  1 -
 docs/testing/user/userguide/runfunctest.rst     |  2 +-
 docs/testing/user/userguide/test_overview.rst   |  7 -------
 functest/ci/testcases.yaml                      | 22 ----------------------
 7 files changed, 2 insertions(+), 56 deletions(-)

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 14dc57bd9..e2a6237c3 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -129,28 +129,6 @@ tiers:
                             - /src/odl_test/csit/suites/integration/basic
                             - /src/odl_test/csit/suites/openstack/neutron
 
-            -
-                case_name: odl_netvirt
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller when
-                    the NetVirt features are installed. It integrates
-                    some test suites from upstream using Robot as the
-                    test framework.
-                dependencies:
-                    installer: 'apex'
-                    scenario: 'os-odl_l3-nofeature'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
-                            - /src/odl_test/csit/suites/openstack/connectivity
-
             -
                 case_name: snaps_smoke
                 project_name: functest
diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index 66ba1916c..7e0bc7851 100644
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -32,7 +32,6 @@ The internal test cases are:
  * refstack_defcore
  * patrole
  * odl
- * odl-netvirt
  * snaps_smoke
  * neutron_trunk
  * tempest_full_parallel
diff --git a/docs/testing/developer/devguide/index.rst b/docs/testing/developer/devguide/index.rst
index 1812a4cb5..d700ac1fe 100644
--- a/docs/testing/developer/devguide/index.rst
+++ b/docs/testing/developer/devguide/index.rst
@@ -89,7 +89,6 @@ The internal test cases in Euphrates are:
  * vping_ssh
  * vping_userdata
  * odl
- * odl_netvirt
  * rally_full
  * rally_sanity
  * tempest_smoke_serial
@@ -107,7 +106,7 @@ The structure of this repository is detailed in `[1]`_.
 The main internal test cases are in the opnfv_tests subfolder of the
 repository, the internal test cases can be grouped by domain:
 
- * sdn: odl, odl_netvirt, odl_fds
+ * sdn: odl, odl_fds
  * openstack: api_check, connection_check, snaps_health_check, vping_ssh,
    vping_userdata, tempest_*, rally_*
  * vnf: cloudify_ims
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst
index a29ff3aaa..df44a9916 100644
--- a/docs/testing/user/configguide/configguide.rst
+++ b/docs/testing/user/configguide/configguide.rst
@@ -120,7 +120,6 @@ Results shall be displayed as follows::
   |       refstack_defcore       |     functest     |     smoke     |      14:37       |      FAIL      |
   |         snaps_smoke          |     functest     |     smoke     |      42:09       |      PASS      |
   |             odl              |     functest     |     smoke     |      00:00       |      SKIP      |
-  |         odl_netvirt          |     functest     |     smoke     |      00:00       |      SKIP      |
   +------------------------------+------------------+---------------+------------------+----------------+
   Note: if the scenario does not support some tests, they are indicated as SKIP.
   See User guide for details.
diff --git a/docs/testing/user/userguide/runfunctest.rst b/docs/testing/user/userguide/runfunctest.rst
index 07e16efed..a8f5a4694 100644
--- a/docs/testing/user/userguide/runfunctest.rst
+++ b/docs/testing/user/userguide/runfunctest.rst
@@ -83,7 +83,7 @@ Testcases can be listed, shown and run though the CLI::
   +-------------------+--------------------------------------------------+------------------+---------------------------+
   |     TEST CASE     |                   DESCRIPTION                    |     CRITERIA     |         DEPENDENCY        |
   +-------------------+--------------------------------------------------+------------------+---------------------------+
-  |     api_check     |     This test case verifies the retrieval of     |       100        |     ^((?!netvirt).)*$     |
+  |     api_check     |     This test case verifies the retrieval of     |       100        |       ^((?!lxd).)*$       |
   |                   |       OpenStack clients: Keystone, Glance,       |                  |                           |
   |                   |      Neutron and Nova and may perform some       |                  |                           |
   |                   |     simple queries. When the config value of     |                  |                           |
diff --git a/docs/testing/user/userguide/test_overview.rst b/docs/testing/user/userguide/test_overview.rst
index 91eb34326..2ab003788 100644
--- a/docs/testing/user/userguide/test_overview.rst
+++ b/docs/testing/user/userguide/test_overview.rst
@@ -96,13 +96,6 @@ validate the scenario for the release.
 |             |               |            | operations mainly based on       |
 |             |               |            | upstream testcases. See below    |
 |             |               |            | for details                      |
-|             |               +------------+----------------------------------+
-|             |               | odl        | Test Suite for the OpenDaylight  |
-|             |               | \_netvirt  | SDN Controller when the NetVirt  |
-|             |               |            | features are installed. It       |
-|             |               |            | integrates some test suites from |
-|             |               |            | upstream using Robot as the test |
-|             |               |            | framework                        |
 +-------------+---------------+------------+----------------------------------+
 | Features    | features      | bgpvpn     | Implementation of the OpenStack  |
 |             |               |            | bgpvpn API from the SDNVPN       |
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index a215d35fb..d0123a474 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -191,28 +191,6 @@ tiers:
                             - /src/odl_test/csit/suites/integration/basic
                             - /src/odl_test/csit/suites/openstack/neutron
 
-            -
-                case_name: odl_netvirt
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller when
-                    the NetVirt features are installed. It integrates
-                    some test suites from upstream using Robot as the
-                    test framework.
-                dependencies:
-                    installer: 'apex'
-                    scenario: 'os-odl_l3-nofeature'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            - /src/odl_test/csit/suites/integration/basic
-                            - /src/odl_test/csit/suites/openstack/neutron
-                            - /src/odl_test/csit/suites/openstack/connectivity
-
             -
                 case_name: snaps_smoke
                 project_name: functest
-- 
2.16.6