Remove identity v2 TCs,not supported by Functest

As Functest does not support identity v2 anymore,
it does not make sense to try to run tempest identity v2 tests.
They need to be removed correspondingly.

JIRA: DOVETAIL-735

Change-Id: I09c06faf52893cc535bbed1fd406b81a7665e787
Signed-off-by: Panagiotis Karalis <pkaralis@intracom-telecom.com>
(cherry picked from commit c266472c9dea9f1a3d58e9a70f761d792ac798dd)

diff --git a/docs/release/release-notes/dovetail-release.rst b/docs/release/release-notes/dovetail-release.rst
index a8aa5cd..7940c97 100644 (file)
--- a/docs/release/release-notes/dovetail-release.rst
+++ b/docs/release/release-notes/dovetail-release.rst
@@ -95,7 +95,6 @@ in parenthesis is shown below for the OVP 2018.08 release.
 - bottlenecks.stress.ping (1)
 - functest.tempest.osinterop (204)
 - functest.tempest.compute (12)
-- functest.tempest.identity_v2 (5)
 - functest.tempest.identity_v3 (11)
 - functest.tempest.image (2)
 - functest.tempest.network_api (14)

diff --git a/docs/testing/user/ovpaddendum/index.rst b/docs/testing/user/ovpaddendum/index.rst
index ae5de8f..3fb8dc4 100644 (file)
--- a/docs/testing/user/ovpaddendum/index.rst
+++ b/docs/testing/user/ovpaddendum/index.rst
@@ -319,7 +319,6 @@ of OVP is as follows:
   - functest.vping.ssh
   - functest.tempest.osinterop\*
   - functest.tempest.compute
-  - functest.tempest.identity_v2
   - functest.tempest.identity_v3
   - functest.tempest.image
   - functest.tempest.network_api

diff --git a/docs/testing/user/testspecification/index.rst b/docs/testing/user/testspecification/index.rst
index d892de1..fff07ee 100644 (file)
--- a/docs/testing/user/testspecification/index.rst
+++ b/docs/testing/user/testspecification/index.rst
@@ -42,7 +42,6 @@ specification documents.
   ./stress/index.rst
   ./snaps_smoke/index.rst
   ./tempest_compute/index.rst
-  ./tempest_identity_v2/index.rst
   ./tempest_identity_v3/index.rst
   ./tempest_image/index.rst
   ./tempest_network/index.rst

diff --git a/docs/testing/user/testspecification/tempest_identity_v2/index.rst b/docs/testing/user/testspecification/tempest_identity_v2/index.rst
deleted file mode 100644 (file)
index 859338c..0000000
--- a/docs/testing/user/testspecification/tempest_identity_v2/index.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-.. This work is licensed under a Creative Commons Attribution 4.0 International License.
-.. http://creativecommons.org/licenses/by/4.0
-.. (c) Ericsson AB
-
-===========================================
-Tempest Identity v2 test specification
-===========================================
-
-
-Scope
-=====
-
-The Tempest Identity v2 test area evaluates the ability of the
-System Under Test (SUT) create, list, delete and verify users through the
-life of a VNF.
-The tests in this test area will evaluate IPv4 network runtime operations
-functionality.
-
-These runtime operations includes:
-
-- Create, List, Verify and Delete Services
-- Create a user
-- Tests for API discovery features
-
-References
-==========
-
-`Identity API v2.0 <https://developer.openstack.org/api-ref/identity/v2-ext/index.html.`_
-
-System Under Test (SUT)
-=======================
-
-The system under test is assumed to be the NFVi and VIM in operation on a
-Pharos compliant infrastructure.
-
-
-Test Area Structure
-===================
-
-The test area is structured in individual tests as listed below.
-For detailed information on the individual steps and assertions performed
-by the tests, review the Python source code accessible via the following links:
-
-All these test cases are included in the test case dovetail.tempest.identity_v2 of
-OVP test suite.
-
-- `Create, List, Verify and Delete Services <https://github.com/openstack/tempest/blob/12.2.0/tempest/api/identity/admin/v2/test_services.py#L24>`_
-    - tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services
-
-- `Create a user <https://github.com/openstack/tempest/blob/12.2.0/tempest/api/identity/admin/v2/test_users.py#L26>`_
-    - tempest.api.identity.admin.v2.test_users.UsersTestJSON.test_create_user
-
-- `Tests for API discovery features <https://github.com/openstack/tempest/blob/12.2.0/tempest/api/identity/v2/test_api_discovery.py#L20>`_
-    - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_media_types
-    - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_version_resources
-    - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_version_statuses
\ No newline at end of file

diff --git a/docs/testing/user/userguide/cli_reference.rst b/docs/testing/user/userguide/cli_reference.rst
index e3d7192..ddf308e 100644 (file)
--- a/docs/testing/user/userguide/cli_reference.rst
+++ b/docs/testing/user/userguide/cli_reference.rst
@@ -141,7 +141,6 @@ Dovetail List Commands
        functest.vping.ssh
        functest.tempest.osinterop
        functest.tempest.compute
-       functest.tempest.identity_v2
        functest.tempest.identity_v3
        functest.tempest.image
        functest.tempest.network_api

diff --git a/docs/testing/user/userguide/testing_guide.rst b/docs/testing/user/userguide/testing_guide.rst
index 7777244..6bf6d29 100644 (file)
--- a/docs/testing/user/userguide/testing_guide.rst
+++ b/docs/testing/user/userguide/testing_guide.rst
@@ -194,9 +194,6 @@ this file should contain.
    # Project-level authentication scope (name or ID), recommend admin project.
    export OS_PROJECT_NAME=admin
 
-   # For identity v2, it uses OS_TENANT_NAME rather than OS_PROJECT_NAME.
-   export OS_TENANT_NAME=admin
-
    # Authentication username, belongs to the project above, recommend admin user.
    export OS_USERNAME=admin
 

diff --git a/etc/compliance/ovp.2018.08.yaml b/etc/compliance/ovp.2018.08.yaml
index 00bc51e..2775d41 100644 (file)
--- a/etc/compliance/ovp.2018.08.yaml
+++ b/etc/compliance/ovp.2018.08.yaml
@@ -7,7 +7,6 @@ ovp.2018.08:
       - functest.vping.ssh
       - functest.tempest.osinterop
       - functest.tempest.compute
-      - functest.tempest.identity_v2
       - functest.tempest.identity_v3
       - functest.tempest.image
       - functest.tempest.network_api

diff --git a/etc/testcase/functest.tempest.identity_v2.yml b/etc/testcase/functest.tempest.identity_v2.yml
deleted file mode 100644 (file)
index 1da6b2a..0000000
--- a/etc/testcase/functest.tempest.identity_v2.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-functest.tempest.identity_v2:
-  name: functest.tempest.identity_v2
-  objective: tempest smoke test cases about identity v2
-  validate:
-    type: functest
-    testcase: tempest_custom
-    pre_condition:
-      - 'cp /home/opnfv/userconfig/pre_config/tempest_conf.yaml /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml'
-      - 'cp /home/opnfv/userconfig/pre_config/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml'
-    pre_copy:
-      src_file: tempest_custom.txt
-      dest_path: /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
-  report:
-    source_archive_files:
-      - functest.log
-      - tempest_custom/tempest.log
-      - tempest_custom/tempest-report.html
-    dest_archive_files:
-      - tempest_logs/functest.tempest.identity_v2.functest.log
-      - tempest_logs/functest.tempest.identity_v2.log
-      - tempest_logs/functest.tempest.identity_v2.html
-    check_results_file: 'functest_results.txt'
-    sub_testcase_list:
-      - tempest.api.identity.admin.v2.test_services.ServicesTestJSON.test_list_services[id-34ea6489-012d-4a86-9038-1287cadd5eca,smoke]
-      - tempest.api.identity.admin.v2.test_users.UsersTestJSON.test_create_user[id-2d55a71e-da1d-4b43-9c03-d269fd93d905,smoke]
-      - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_media_types[id-007a0be0-78fe-4fdb-bbee-e9216cc17bb2,smoke]
-      - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_version_resources[id-ea889a68-a15f-4166-bfb1-c12456eae853,smoke]
-      - tempest.api.identity.v2.test_api_discovery.TestApiDiscovery.test_api_version_statuses[id-77fd6be0-8801-48e6-b9bf-38cdd2f253ec,smoke]

diff --git a/etc/userconfig/env_config.sh.sample b/etc/userconfig/env_config.sh.sample
index 4bb77ab..f39d8d0 100644 (file)
--- a/etc/userconfig/env_config.sh.sample
+++ b/etc/userconfig/env_config.sh.sample
@@ -1,9 +1,6 @@
 # Project-level authentication scope (name or ID), recommend admin project.
 export OS_PROJECT_NAME=admin
 
-# For identity v2, it uses OS_TENANT_NAME rather than OS_PROJECT_NAME.
-export OS_TENANT_NAME=admin
-
 # Authentication username, belongs to the project above, recommend admin user.
 export OS_USERNAME=admin