Rename tempest_tests to tempest

Rename tempest_tests to tempest

Change-Id: Ia8285afb3b8eba51fe3160643c5c04097839c92b

senlin/tests/tempest/README.rst

@@ -14,4 +14,4 @@ To run only these tests in tempest, go to tempest directory, then run::
 
 To run a single test case, go to tempest directory, then run with test case name, e.g.::
 
-    $ ./run_tempest.sh -N -- senlin.tests.tempest_tests.tests.api.test_cluster_basic.TestClusterBasic.test_cluster_create_delete
+    $ ./run_tempest.sh -N -- senlin.tests.tempest.tests.api.test_cluster_basic.TestClusterBasic.test_cluster_create_delete

senlin/tests/tempest/plugin.py

@@ -17,16 +17,17 @@ import os
 from tempest import config
 from tempest.test_discover import plugins
 
-from senlin.tests.tempest_tests import config as config_senlin
+from senlin.tests.tempest import config as config_senlin
 
 
 class SenlinTempestPlugin(plugins.TempestPlugin):
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
             os.path.abspath(__file__)))[0]
-        test_dir = "tempest_tests/tests"
+        base_path += '/../..'
+        test_dir = "senlin/tests/tempest/tests"
         full_test_dir = os.path.join(base_path, test_dir)
-        return full_test_dir, base_path+'/../..'
+        return full_test_dir, base_path
 
     def register_opts(self, conf):
         config.register_opt_group(conf, config_senlin.service_available_group,

senlin/tests/tempest/tests/api/base.py

@@ -20,7 +20,7 @@ from tempest.lib import exceptions
 from tempest import test
 # from tempest_lib.common.utils import data_utils
 
-from senlin.tests.tempest_tests.services.clustering import clustering_client
+from senlin.tests.tempest.services.clustering import clustering_client
 
 CONF = config.CONF
 lOG = log.getLogger(__name__)

senlin/tests/tempest/tests/api/test_cluster_basic.py

@@ -13,8 +13,8 @@
 import copy
 from tempest.lib import decorators
 
-from senlin.tests.tempest_tests.tests.api import base
-from senlin.tests.tempest_tests.tests.common import constants
+from senlin.tests.tempest.tests.api import base
+from senlin.tests.tempest.tests.common import constants
 
 
 class TestClusterBasic(base.BaseSenlinTest):

setup.cfg

@@ -51,7 +51,7 @@ senlin.drivers =
     openstack_test = senlin.tests.functional.drivers.openstack
 
 tempest.test_plugins =
-    senlin_tests = senlin.tests.tempest_tests.plugin:SenlinTempestPlugin
+    senlin_tests = senlin.tests.tempest.plugin:SenlinTempestPlugin
 
 [global]
 setup-hooks =