diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-01-11 13:27:29 -0800 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-01-16 22:36:19 +0000 |
| commit | 1e2f538fb02f7986e4509bf7815617f75327c135 (patch) | |
| tree | 28845b7c228430b171f858890eb2ecd9bc15709d | |
| parent | 0e56a27dffd5207c22d8e0539a6a9e8e9baec063 (diff) | |
| download | nova-1e2f538fb02f7986e4509bf7815617f75327c135.tar.gz | |
Remove 'location' from GlanceImageService
Glance no longer returns location through its public API, so we
should not attempt to display it. Addresses bug 911599.
(cherry picked from commit 3e015b869789c7aeeb90e160ede3b3a7b7921f30)
Change-Id: I3400006eb6ab94095c0c2d2b5dc90cb9b7775a84
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | nova/image/glance.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_image_metadata.py | 3 |
3 files changed, 2 insertions, 4 deletions
@@ -8,6 +8,7 @@ <ant@openstack.org> <amesserl@rackspace.com> <Armando.Migliaccio@eu.citrix.com> <armando.migliaccio@citrix.com> <brian.lamar@rackspace.com> <brian.lamar@gmail.com> +<brian.waldon@rackspace.com> <bcwaldon@gmail.com> <bschott@isi.edu> <bfschott@gmail.com> <cbehrens@codestud.com> <chris.behrens@rackspace.com> <chiradeep@cloud.com> <chiradeep@chiradeep-lt2> diff --git a/nova/image/glance.py b/nova/image/glance.py index cd97268a1a..5906634e1c 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -117,7 +117,7 @@ def get_glance_client(context, image_href): class GlanceImageService(service.BaseImageService): """Provides storage and retrieval of disk image objects within Glance.""" - GLANCE_ONLY_ATTRS = ['size', 'location', 'disk_format', + GLANCE_ONLY_ATTRS = ['size', 'disk_format', 'container_format', 'checksum'] # NOTE(sirp): Overriding to use _translate_to_service provided by diff --git a/nova/tests/api/openstack/test_image_metadata.py b/nova/tests/api/openstack/test_image_metadata.py index ea5bba5a2d..4d2473ec62 100644 --- a/nova/tests/api/openstack/test_image_metadata.py +++ b/nova/tests/api/openstack/test_image_metadata.py @@ -41,7 +41,6 @@ class ImageMetaDataTest(test.TestCase): 'disk_format': None, 'updated_at': '2011-03-22T17:40:15', 'id': '1', - 'location': 'file:///var/lib/glance/images/1', 'is_public': True, 'deleted_at': None, 'properties': { @@ -57,7 +56,6 @@ class ImageMetaDataTest(test.TestCase): 'disk_format': None, 'updated_at': '2011-03-22T17:40:15', 'id': '2', - 'location': 'file:///var/lib/glance/images/2', 'is_public': True, 'deleted_at': None, 'properties': { @@ -73,7 +71,6 @@ class ImageMetaDataTest(test.TestCase): 'disk_format': None, 'updated_at': '2011-03-22T17:40:15', 'id': '3', - 'location': 'file:///var/lib/glance/images/2', 'is_public': True, 'deleted_at': None, 'properties': {}, |