diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-06 23:05:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-06 23:05:12 +0000 |
| commit | 67715309a1cda8cc56bf4e528774f75e652bf6d5 (patch) | |
| tree | 6aa19bc780adee820079e59376ca8212c0fd647e | |
| parent | 922420faf353f0296eacee00e8c0ba372c04fbea (diff) | |
| parent | ff716dee035dd51257b240fad842ecfd70d9d90d (diff) | |
| download | nova-67715309a1cda8cc56bf4e528774f75e652bf6d5.tar.gz nova-67715309a1cda8cc56bf4e528774f75e652bf6d5.tar.xz nova-67715309a1cda8cc56bf4e528774f75e652bf6d5.zip | |
Merge "Ensure image status filter matches glance format"
| -rw-r--r-- | nova/api/openstack/compute/images.py | 5 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_images.py | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nova/api/openstack/compute/images.py b/nova/api/openstack/compute/images.py index eceee6651..629ba67d5 100644 --- a/nova/api/openstack/compute/images.py +++ b/nova/api/openstack/compute/images.py @@ -124,6 +124,11 @@ class Controller(wsgi.Controller): except (AttributeError, IndexError, KeyError): pass + filter_name = 'status' + if filter_name in filters: + # The Image API expects us to use lowercase strings for status + filters[filter_name] = filters[filter_name].lower() + return filters @wsgi.serializers(xml=ImageTemplate) diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py index 0bcae01ce..64ac7edc1 100644 --- a/nova/tests/api/openstack/compute/test_images.py +++ b/nova/tests/api/openstack/compute/test_images.py @@ -847,7 +847,7 @@ class ImagesControllerTest(test.TestCase): def test_image_filter_with_status(self): image_service = self.mox.CreateMockAnything() - filters = {'status': 'ACTIVE'} + filters = {'status': 'active'} request = fakes.HTTPRequest.blank('/v2/images?status=ACTIVE') context = request.environ['nova.context'] image_service.index(context, filters=filters).AndReturn([]) @@ -900,7 +900,7 @@ class ImagesControllerTest(test.TestCase): def test_image_filter_not_supported(self): image_service = self.mox.CreateMockAnything() - filters = {'status': 'ACTIVE'} + filters = {'status': 'active'} request = fakes.HTTPRequest.blank('/v2/images?status=ACTIVE&' 'UNSUPPORTEDFILTER=testname') context = request.environ['nova.context'] @@ -942,7 +942,7 @@ class ImagesControllerTest(test.TestCase): def test_image_detail_filter_with_status(self): image_service = self.mox.CreateMockAnything() - filters = {'status': 'ACTIVE'} + filters = {'status': 'active'} request = fakes.HTTPRequest.blank('/v2/fake/images/detail' '?status=ACTIVE') context = request.environ['nova.context'] @@ -1010,7 +1010,7 @@ class ImagesControllerTest(test.TestCase): def test_image_detail_filter_not_supported(self): image_service = self.mox.CreateMockAnything() - filters = {'status': 'ACTIVE'} + filters = {'status': 'active'} request = fakes.HTTPRequest.blank('/v2/fake/images/detail?status=' 'ACTIVE&UNSUPPORTEDFILTER=testname') context = request.environ['nova.context'] |