| commit | 076d412210b567069509f23dcfa0f2d0368e2df5 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Mon Apr 03 19:15:32 2017 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Mon Apr 03 19:15:32 2017 +0000 |
| tree | 6b6a841742b1bf7985f16c22bdcc8facc7eadc3d | |
| parent | dbffd22f44241146c03a98d6ff3a8479c1bc9174 [diff] | |
| parent | 7fd5d4bbdb368c863eab7c8f14620e9918569421 [diff] |
Merge "Move Cinder admin tests into unversioned path"
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