Move and rename tempest_tests to cinder/tests/tempest

To avoid conflicts, it needs to be done and
the subdirs 'api' and 'scenario' directly under
the cinder/tests/tempest directory

Closes-Bug: #1577016

Change-Id: I5b8d1411e0917ecb7e70eb5a6b139d75437ba032

cinder/tests/tempest/plugin.py

@@ -13,20 +13,19 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-
+import cinder
 import os
 
+from cinder.tests.tempest import config as project_config
 from tempest import config
 from tempest.test_discover import plugins
 
-from tempest_tests import config as project_config
-
 
 class CinderTempestPlugin(plugins.TempestPlugin):
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
-            os.path.abspath(__file__)))[0]
+            os.path.abspath(cinder.__file__)))[0]
-        test_dir = "tempest_tests/tests"
+        test_dir = "cinder/tests/tempest"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path
 

setup.cfg

@@ -73,7 +73,7 @@ cinder.database.migration_backend =
     sqlalchemy = oslo_db.sqlalchemy.migration
 # In-tree Tempest test entry point
 tempest.test_plugins =
-    cinder_tests = tempest_tests.plugin:CinderTempestPlugin
+    cinder_tests = cinder.tests.tempest.plugin:CinderTempestPlugin
 
 [build_sphinx]
 all_files = 1