From 11c1e6eab8e246bdfb5e8a6c8b4c2aed5a558a14 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Wed, 22 Feb 2017 19:20:07 +0100
Subject: [PATCH] Add custom tempest test.

Some users need to run a specific list of
tempest test cases. This patch allows them
to do that by running the command:

    functest testcase run tempest_custom

Change-Id: If8e7726b98c3a71398c7abdf80aea79f10653ebf
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 functest/ci/testcases.yaml                               | 16 ++++++++++++++++
 .../openstack/tempest/custom_tests/test_list.txt         |  4 ++++
 functest/opnfv_tests/openstack/tempest/tempest.py        |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 009f9b79d..fd86441b5 100755
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -397,6 +397,22 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestDefcore'
+            -
+                name: tempest_custom
+                criteria: 'success_rate == 100%'
+                blocking: false
+                description: >-
+                    The test case allows running a customized list of tempest
+                    test cases defined in a file under
+                    <dir_functest_repo>/functest/opnfv_tests/openstack/
+                      /tempest/custom_tests/test_list.txt
+                    The file is empty and can be customized with the desired tests.
+                dependencies:
+                    installer: 'unknown'
+                    scenario: 'unknown'
+                run:
+                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
+                    class: 'TempestCustom'
 #            -
 #                name: rally_full
 #                criteria: 'success_rate >= 90%'
diff --git a/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt b/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
new file mode 100644
index 000000000..ac4e37289
--- /dev/null
+++ b/functest/opnfv_tests/openstack/tempest/custom_tests/test_list.txt
@@ -0,0 +1,4 @@
+# This is an empty file to be filled up with the desired tempest test cases
+# Examples:
+#tempest.scenario.test_server_basic_ops.TestServerBasicOps.test_server_basic_ops
+#tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_network_basic_ops
\ No newline at end of file
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 37b5c0ee7..4c96500db 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -324,11 +324,11 @@ class TempestMultisite(TempestCommon):
 
 class TempestCustom(TempestCommon):
 
-    def __init__(self, mode, option):
+    def __init__(self):
         TempestCommon.__init__(self)
         self.case_name = "tempest_custom"
-        self.MODE = mode
-        self.OPTION = option
+        self.MODE = "custom"
+        self.OPTION = "--concurrency 1"
 
 
 class TempestDefcore(TempestCommon):
-- 
2.16.6