diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-11 22:05:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-11 22:05:41 +0000 |
| commit | 52a64dfd0b9f9fc169e50c79f557eb2da022d537 (patch) | |
| tree | 6a36ad222ca04d26680a176470cdcdec9f31741e | |
| parent | 4d01531f91e4b20db2cb6ff738ee9af724ed2bf1 (diff) | |
| parent | 3e015b869789c7aeeb90e160ede3b3a7b7921f30 (diff) | |
| download | nova-52a64dfd0b9f9fc169e50c79f557eb2da022d537.tar.gz nova-52a64dfd0b9f9fc169e50c79f557eb2da022d537.tar.xz nova-52a64dfd0b9f9fc169e50c79f557eb2da022d537.zip | |
Merge "Remove 'location' from GlanceImageService"
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | nova/image/glance.py | 2 | ||||
| -rw-r--r-- | nova/tests/image/test_glance.py | 6 |
3 files changed, 2 insertions, 7 deletions
@@ -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> diff --git a/nova/image/glance.py b/nova/image/glance.py index 9eea8eb4c..2a24d534e 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -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', diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py index 2ab1897f9..5e9f9d79b 100644 --- a/nova/tests/image/test_glance.py +++ b/nova/tests/image/test_glance.py @@ -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, |