| commit | 82e5b2d8374ff57ef7e45cc596f447fe264d8426 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Tue Apr 04 12:09:25 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Tue Apr 04 12:09:25 2017 +0000 |
| tree | 6f4a665be0e894341c6c1f6edcd345ea259e13e2 | |
| parent | 076d412210b567069509f23dcfa0f2d0368e2df5 [diff] | |
| parent | 2ea48f06f232a52661dab6582c1a01c96366a2fe [diff] |
Merge "Rename server arg in wait_for_interface_status method"
diff --git a/tempest/api/volume/admin/v2/test_backends_capabilities.py b/tempest/api/volume/admin/test_backends_capabilities.py similarity index 100% rename from tempest/api/volume/admin/v2/test_backends_capabilities.py rename to tempest/api/volume/admin/test_backends_capabilities.py
diff --git a/tempest/api/volume/admin/v2/test_snapshot_manage.py b/tempest/api/volume/admin/test_snapshot_manage.py similarity index 100% rename from tempest/api/volume/admin/v2/test_snapshot_manage.py rename to tempest/api/volume/admin/test_snapshot_manage.py
diff --git a/tempest/api/volume/admin/v3/test_user_messages.py b/tempest/api/volume/admin/test_user_messages.py similarity index 100% rename from tempest/api/volume/admin/v3/test_user_messages.py rename to tempest/api/volume/admin/test_user_messages.py
diff --git a/tempest/api/volume/admin/v2/test_volume_pools.py b/tempest/api/volume/admin/test_volume_pools.py similarity index 100% rename from tempest/api/volume/admin/v2/test_volume_pools.py rename to tempest/api/volume/admin/test_volume_pools.py
diff --git a/tempest/api/volume/admin/v2/test_volume_type_access.py b/tempest/api/volume/admin/test_volume_type_access.py similarity index 100% rename from tempest/api/volume/admin/v2/test_volume_type_access.py rename to tempest/api/volume/admin/test_volume_type_access.py
diff --git a/tempest/api/volume/admin/v2/test_volumes_list.py b/tempest/api/volume/admin/test_volumes_list.py similarity index 100% rename from tempest/api/volume/admin/v2/test_volumes_list.py rename to tempest/api/volume/admin/test_volumes_list.py
diff --git a/tempest/api/volume/admin/v2/__init__.py b/tempest/api/volume/admin/v2/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/tempest/api/volume/admin/v2/__init__.py +++ /dev/null
diff --git a/tempest/api/volume/admin/v3/__init__.py b/tempest/api/volume/admin/v3/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/tempest/api/volume/admin/v3/__init__.py +++ /dev/null
diff --git a/tempest/lib/cmd/check_uuid.py b/tempest/lib/cmd/check_uuid.py index eafde44..e911776 100755 --- a/tempest/lib/cmd/check_uuid.py +++ b/tempest/lib/cmd/check_uuid.py
@@ -29,7 +29,7 @@ DECORATOR_MODULE = 'decorators' DECORATOR_NAME = 'idempotent_id' DECORATOR_IMPORT = 'tempest.%s' % DECORATOR_MODULE -IMPORT_LINE = 'from tempest import %s' % DECORATOR_MODULE +IMPORT_LINE = 'from tempest.lib import %s' % DECORATOR_MODULE DECORATOR_TEMPLATE = "@%s.%s('%%s')" % (DECORATOR_MODULE, DECORATOR_NAME) UNIT_TESTS_EXCLUDE = 'tempest.tests'