openstack/nova
Code Issues Proposed changes

Merge "Make DeregisterImage respect AWS EC2 specification"

Browse Source
This commit is contained in:
Jenkins 2012-09-18 12:52:52 +00:00 committed by Gerrit Code Review
commit 5b8d9ada4b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/ec2/cloud.py
View File

@ -1365,7 +1365,7 @@ class CloudController(object):
image = self._get_image(context, image_id)
internal_id = image['id']
self.image_service.delete(context, internal_id)
return {'imageId': image_id}
return True
def _register_image(self, context, metadata):
image = self.image_service.create(context, metadata)

2
nova/tests/api/ec2/test_cloud.py
View File

@ -1575,7 +1575,7 @@ class CloudTestCase(test.TestCase):
self.stubs.Set(fake._FakeImageService, 'delete', fake_delete)
# valid image
result = deregister_image(self.context, 'ami-00000001')
self.assertEqual(result['imageId'], 'ami-00000001')
self.assertTrue(result)
# invalid image
self.stubs.UnsetAll()