From 75511e3a85d48a58a85541d1a0d4e66aeb99d862 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Mon, 22 Jan 2018 12:52:00 +0530 Subject: [PATCH] Refactored cinder tempest tests to cinder_tempest_plugin * As per the current codebase of cinder tempest plugin, it is getting dumped in the cinder/tests and the package name is setup.cfg is cinder_tempest_plugin which does not exists. So i refactored to give a proper tempest plugin shape. Change-Id: Ia78ea53a99923844f40fb4e9fe22ec0da4b0c335 --- {cinder/tests/tempest => cinder_tempest_plugin}/__init__.py | 0 .../tests/tempest => cinder_tempest_plugin}/api/__init__.py | 0 .../tempest => cinder_tempest_plugin}/api/volume/__init__.py | 0 .../tempest => cinder_tempest_plugin}/api/volume/base.py | 0 .../api/volume/test_consistencygroups.py | 4 ++-- .../api/volume/test_volume_backup.py | 2 +- .../api/volume/test_volume_revert.py | 4 ++-- .../api/volume/test_volume_unicode.py | 2 +- .../tests/tempest => cinder_tempest_plugin}/cinder_clients.py | 4 ++-- {cinder/tests/tempest => cinder_tempest_plugin}/config.py | 0 {cinder/tests/tempest => cinder_tempest_plugin}/plugin.py | 4 ++-- .../tempest => cinder_tempest_plugin}/scenario/__init__.py | 0 .../tempest => cinder_tempest_plugin}/services/__init__.py | 0 .../services/consistencygroups_client.py | 0 .../services/volume_revert_client.py | 0 setup.cfg | 2 +- 16 files changed, 11 insertions(+), 11 deletions(-) rename {cinder/tests/tempest => cinder_tempest_plugin}/__init__.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/__init__.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/volume/__init__.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/volume/base.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/volume/test_consistencygroups.py (99%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/volume/test_volume_backup.py (99%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/volume/test_volume_revert.py (97%) rename {cinder/tests/tempest => cinder_tempest_plugin}/api/volume/test_volume_unicode.py (97%) rename {cinder/tests/tempest => cinder_tempest_plugin}/cinder_clients.py (91%) rename {cinder/tests/tempest => cinder_tempest_plugin}/config.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/plugin.py (92%) rename {cinder/tests/tempest => cinder_tempest_plugin}/scenario/__init__.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/services/__init__.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/services/consistencygroups_client.py (100%) rename {cinder/tests/tempest => cinder_tempest_plugin}/services/volume_revert_client.py (100%) diff --git a/cinder/tests/tempest/__init__.py b/cinder_tempest_plugin/__init__.py similarity index 100% rename from cinder/tests/tempest/__init__.py rename to cinder_tempest_plugin/__init__.py diff --git a/cinder/tests/tempest/api/__init__.py b/cinder_tempest_plugin/api/__init__.py similarity index 100% rename from cinder/tests/tempest/api/__init__.py rename to cinder_tempest_plugin/api/__init__.py diff --git a/cinder/tests/tempest/api/volume/__init__.py b/cinder_tempest_plugin/api/volume/__init__.py similarity index 100% rename from cinder/tests/tempest/api/volume/__init__.py rename to cinder_tempest_plugin/api/volume/__init__.py diff --git a/cinder/tests/tempest/api/volume/base.py b/cinder_tempest_plugin/api/volume/base.py similarity index 100% rename from cinder/tests/tempest/api/volume/base.py rename to cinder_tempest_plugin/api/volume/base.py diff --git a/cinder/tests/tempest/api/volume/test_consistencygroups.py b/cinder_tempest_plugin/api/volume/test_consistencygroups.py similarity index 99% rename from cinder/tests/tempest/api/volume/test_consistencygroups.py rename to cinder_tempest_plugin/api/volume/test_consistencygroups.py index 18ba654..d6b8e4a 100644 --- a/cinder/tests/tempest/api/volume/test_consistencygroups.py +++ b/cinder_tempest_plugin/api/volume/test_consistencygroups.py @@ -19,8 +19,8 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from cinder.tests.tempest.api.volume import base -from cinder.tests.tempest import cinder_clients +from cinder_tempest_plugin.api.volume import base +from cinder_tempest_plugin import cinder_clients CONF = config.CONF diff --git a/cinder/tests/tempest/api/volume/test_volume_backup.py b/cinder_tempest_plugin/api/volume/test_volume_backup.py similarity index 99% rename from cinder/tests/tempest/api/volume/test_volume_backup.py rename to cinder_tempest_plugin/api/volume/test_volume_backup.py index 765585e..4eb7703 100644 --- a/cinder/tests/tempest/api/volume/test_volume_backup.py +++ b/cinder_tempest_plugin/api/volume/test_volume_backup.py @@ -18,7 +18,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib import decorators -from cinder.tests.tempest.api.volume import base +from cinder_tempest_plugin.api.volume import base CONF = config.CONF diff --git a/cinder/tests/tempest/api/volume/test_volume_revert.py b/cinder_tempest_plugin/api/volume/test_volume_revert.py similarity index 97% rename from cinder/tests/tempest/api/volume/test_volume_revert.py rename to cinder_tempest_plugin/api/volume/test_volume_revert.py index d82ada6..15e4aed 100644 --- a/cinder/tests/tempest/api/volume/test_volume_revert.py +++ b/cinder_tempest_plugin/api/volume/test_volume_revert.py @@ -17,8 +17,8 @@ from tempest.common import waiters from tempest import config from tempest.lib import decorators -from cinder.tests.tempest.api.volume import base -from cinder.tests.tempest import cinder_clients +from cinder_tempest_plugin.api.volume import base +from cinder_tempest_plugin import cinder_clients CONF = config.CONF diff --git a/cinder/tests/tempest/api/volume/test_volume_unicode.py b/cinder_tempest_plugin/api/volume/test_volume_unicode.py similarity index 97% rename from cinder/tests/tempest/api/volume/test_volume_unicode.py rename to cinder_tempest_plugin/api/volume/test_volume_unicode.py index db280d3..84d43e4 100644 --- a/cinder/tests/tempest/api/volume/test_volume_unicode.py +++ b/cinder_tempest_plugin/api/volume/test_volume_unicode.py @@ -19,7 +19,7 @@ from tempest import config from tempest.lib.common.utils import data_utils from tempest.lib.common.utils import test_utils -from cinder.tests.tempest.api.volume import base +from cinder_tempest_plugin.api.volume import base CONF = config.CONF diff --git a/cinder/tests/tempest/cinder_clients.py b/cinder_tempest_plugin/cinder_clients.py similarity index 91% rename from cinder/tests/tempest/cinder_clients.py rename to cinder_tempest_plugin/cinder_clients.py index 8d9abe7..f4c7c0e 100644 --- a/cinder/tests/tempest/cinder_clients.py +++ b/cinder_tempest_plugin/cinder_clients.py @@ -15,8 +15,8 @@ from tempest import config -from cinder.tests.tempest.services import consistencygroups_client -from cinder.tests.tempest.services import volume_revert_client +from cinder_tempest_plugin.services import consistencygroups_client +from cinder_tempest_plugin.services import volume_revert_client CONF = config.CONF diff --git a/cinder/tests/tempest/config.py b/cinder_tempest_plugin/config.py similarity index 100% rename from cinder/tests/tempest/config.py rename to cinder_tempest_plugin/config.py diff --git a/cinder/tests/tempest/plugin.py b/cinder_tempest_plugin/plugin.py similarity index 92% rename from cinder/tests/tempest/plugin.py rename to cinder_tempest_plugin/plugin.py index b816963..eed4016 100644 --- a/cinder/tests/tempest/plugin.py +++ b/cinder_tempest_plugin/plugin.py @@ -16,7 +16,7 @@ import cinder import os -from cinder.tests.tempest import config as project_config +from cinder_tempest_plugin import config as project_config from tempest import config from tempest.test_discover import plugins @@ -26,7 +26,7 @@ class CinderTempestPlugin(plugins.TempestPlugin): def load_tests(self): base_path = os.path.split(os.path.dirname( os.path.abspath(cinder.__file__)))[0] - test_dir = "cinder/tests/tempest" + test_dir = "cinder_tempest_plugin" full_test_dir = os.path.join(base_path, test_dir) return full_test_dir, base_path diff --git a/cinder/tests/tempest/scenario/__init__.py b/cinder_tempest_plugin/scenario/__init__.py similarity index 100% rename from cinder/tests/tempest/scenario/__init__.py rename to cinder_tempest_plugin/scenario/__init__.py diff --git a/cinder/tests/tempest/services/__init__.py b/cinder_tempest_plugin/services/__init__.py similarity index 100% rename from cinder/tests/tempest/services/__init__.py rename to cinder_tempest_plugin/services/__init__.py diff --git a/cinder/tests/tempest/services/consistencygroups_client.py b/cinder_tempest_plugin/services/consistencygroups_client.py similarity index 100% rename from cinder/tests/tempest/services/consistencygroups_client.py rename to cinder_tempest_plugin/services/consistencygroups_client.py diff --git a/cinder/tests/tempest/services/volume_revert_client.py b/cinder_tempest_plugin/services/volume_revert_client.py similarity index 100% rename from cinder/tests/tempest/services/volume_revert_client.py rename to cinder_tempest_plugin/services/volume_revert_client.py diff --git a/setup.cfg b/setup.cfg index 879c210..ff06dac 100644 --- a/setup.cfg +++ b/setup.cfg @@ -47,4 +47,4 @@ output_file = cinder_tempest_plugin/locale/cinder_tempest_plugin.pot [entry_points] tempest.test_plugins = - cinder_tests = cinder.tests.tempest.plugin:CinderTempestPlugin + cinder_tests = cinder_tempest_plugin.plugin:CinderTempestPlugin