| commit | 1ebaf561179dea472c4078a40afa6c4bdf7bfe31 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Sun Mar 03 22:53:47 2013 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Sun Mar 03 22:53:47 2013 +0000 |
| tree | 2182e72762ec647a1ded244dda7188ae08249da0 | |
| parent | 2eeeef0c68ae2f181b6043892a6f041e57478beb [diff] | |
| parent | 6d59c9962dedaf077dc84ffc93a62d2358a886b0 [diff] |
Merge "Move glance image client and tests into v1 dirs."
diff --git a/tempest/clients.py b/tempest/clients.py index ef07d9c..f2e89a7 100644 --- a/tempest/clients.py +++ b/tempest/clients.py
@@ -52,7 +52,7 @@ from tempest.services.identity.json.identity_client import TokenClientJSON from tempest.services.identity.xml.identity_client import IdentityClientXML from tempest.services.identity.xml.identity_client import TokenClientXML -from tempest.services.image.json.image_client import ImageClientJSON +from tempest.services.image.v1.json.image_client import ImageClientJSON from tempest.services.network.json.network_client import NetworkClient from tempest.services.object_storage.account_client import AccountClient from tempest.services.object_storage.account_client import \
diff --git a/tempest/services/image/json/__init__.py b/tempest/services/image/v1/__init__.py similarity index 100% copy from tempest/services/image/json/__init__.py copy to tempest/services/image/v1/__init__.py
diff --git a/tempest/services/image/json/__init__.py b/tempest/services/image/v1/json/__init__.py similarity index 100% rename from tempest/services/image/json/__init__.py rename to tempest/services/image/v1/json/__init__.py
diff --git a/tempest/services/image/json/image_client.py b/tempest/services/image/v1/json/image_client.py similarity index 100% rename from tempest/services/image/json/image_client.py rename to tempest/services/image/v1/json/image_client.py
diff --git a/tempest/services/image/json/__init__.py b/tempest/tests/image/v1/__init__.py similarity index 100% copy from tempest/services/image/json/__init__.py copy to tempest/tests/image/v1/__init__.py
diff --git a/tempest/tests/image/test_images.py b/tempest/tests/image/v1/test_images.py similarity index 100% rename from tempest/tests/image/test_images.py rename to tempest/tests/image/v1/test_images.py