Refactor tempest common

It also renames two testcases and updates all docs because tests
run in parallel in case of tempest smoke.

To force one thread as before:
run:
    module: 'functest.opnfv_tests.openstack.tempest.tempest'
    class: 'TempestCommon'
    args:
        mode: '^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'
        option:
            - '--concurrency=1'

JIRA: FUNCTEST-989

Change-Id: I1348f5908400a5046be8edf983db4afa12e546c3
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 4 insertions, 16 deletions

diff --git a/functest/opnfv_tests/openstack/patrole/patrole.py b/functest/opnfv_tests/openstack/patrole/patrole.py
index a00e17c37..efc513cdb 100644
--- a/functest/opnfv_tests/openstack/patrole/patrole.py
+++ b/functest/opnfv_tests/openstack/patrole/patrole.py
@@ -10,29 +10,16 @@
 # pylint: disable=missing-docstring
 
 import logging
-import os
 
 from six.moves import configparser
 
 from functest.opnfv_tests.openstack.tempest import tempest
-from functest.utils import config
 
 
 class Patrole(tempest.TempestCommon):
 
     __logger = logging.getLogger(__name__)
 
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = 'patrole'
-        super(Patrole, self).__init__(**kwargs)
-        self.res_dir = os.path.join(
-            getattr(config.CONF, 'dir_results'), 'patrole')
-        self.list = os.path.join(self.res_dir, 'tempest-list.txt')
-
-    def apply_tempest_blacklist(self):
-        pass
-
     def configure(self, **kwargs):
         super(Patrole, self).configure(**kwargs)
         rconfig = configparser.RawConfigParser()
@@ -46,7 +33,8 @@ class Patrole(tempest.TempestCommon):
 
     def run(self, **kwargs):
         for exclude in kwargs.get('exclude', []):
-            self.mode = "{}(?!.*{})".format(self.mode, exclude)
-        self.mode = "'{}(?=patrole_tempest_plugin.tests.api.({}))'".format(
-            self.mode, '|'.join(kwargs.get('services', [])))
+            kwargs['mode'] = "{}(?!.*{})".format(
+                kwargs.get('mode', ''), exclude)
+        kwargs['mode'] = '{}(?=patrole_tempest_plugin.tests.api.({}))'.format(
+            kwargs['mode'], '|'.join(kwargs.get('services', [])))
         return super(Patrole, self).run(**kwargs)