openstack
/
nova
Code Issues Proposed changes

Remove 'location' from GlanceImageService 

Glance no longer returns location through its public API, so we
should not attempt to display it. Addresses bug 911599.

Change-Id: I3400006eb6ab94095c0c2d2b5dc90cb9b7775a84
This commit is contained in:
Brian Waldon 2012-01-11 13:27:29 -08:00
parent 0bbf67cf39
commit 3e015b8697
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -9,6 +9,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>

2
nova/image/glance.py
View File

@ -435,7 +435,7 @@ def _convert_to_string(metadata):
def _limit_attributes(image_meta):
IMAGE_ATTRIBUTES = ['size', 'location', 'disk_format',
IMAGE_ATTRIBUTES = ['size', 'disk_format',
'container_format', 'checksum', 'id',
'name', 'created_at', 'updated_at',
'deleted_at', 'deleted', 'status',

6
nova/tests/image/test_glance.py
View File

@ -129,7 +129,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@ -161,7 +160,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@ -311,7 +309,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@ -356,7 +353,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@ -436,7 +432,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,
@ -472,7 +467,6 @@ class TestGlanceImageService(test.TestCase):
'size': None,
'min_disk': None,
'min_ram': None,
'location': None,
'disk_format': None,
'container_format': None,
'checksum': None,