From 537d6a870ec5e9cbe09e9335b07d364d85cf7ec0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Fri, 1 May 2020 10:49:21 +0200
Subject: [PATCH] Rename barbican->tempest_barbican & octavia->tempest_octavia
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It unifies all test case names.

Change-Id: I38576f2d6bae6ef0236b6acfbd30c0446d3a2eca
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit a11051968f25bdcc9362be88907731582ac1ea8f)
---
 ansible/site.yml                                | 4 ++--
 docker/smoke/testcases.yaml                     | 4 ++--
 docs/release/release-notes/functest-release.rst | 4 ++--
 functest/ci/testcases.yaml                      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/site.yml b/ansible/site.yml
index 5902cc6e6..470b4b07e 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -72,8 +72,8 @@
             - neutron_trunk
             - networking-bgpvpn
             - networking-sfc
-            - barbican
-            - octavia
+            - tempest_barbican
+            - tempest_octavia
         - container: functest-benchmarking
           tests:
             - rally_full
diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index d3656aa5a..0403f7ae3 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -249,7 +249,7 @@ tiers:
                             - '--concurrency=0'
 
             -
-                case_name: barbican
+                case_name: tempest_barbican
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -265,7 +265,7 @@ tiers:
                             - barbican
 
             -
-                case_name: octavia
+                case_name: tempest_octavia
                 project_name: functest
                 criteria: 100
                 blocking: false
diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index f7666a815..40b3c88f6 100644
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -47,10 +47,10 @@ The internal test cases are:
  * tempest_scenario
  * tempest_slow
  * patrole
- * barbican
+ * tempest_barbican
  * networking-bgpvpn
  * networking-sfc
- * octavia
+ * tempest_octavia
  * rally_full
  * rally_jobs
  * vmtp
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 3898b9859..c6f74f172 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -427,7 +427,7 @@ tiers:
                             - '--concurrency=0'
 
             -
-                case_name: barbican
+                case_name: tempest_barbican
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -443,7 +443,7 @@ tiers:
                             - barbican
 
             -
-                case_name: octavia
+                case_name: tempest_octavia
                 project_name: functest
                 criteria: 100
                 blocking: false
-- 
2.16.6