Yasuke/moto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #87 from hltbra/ami-backend-describe_images-refactoring

Browse Source 
Refactor AmiBackend.describe_images: make logic of missing image simpler
This commit is contained in:
Steve Pulec 2014-01-28 15:56:09 -08:00
commit cbee186f45
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
moto/ec2/models.py
View File

@ -219,14 +219,14 @@ class AmiBackend(object):
self.amis[ami_id] = ami self.amis[ami_id] = ami
return ami return ami
def describe_images(self, ami_ids=None): def describe_images(self, ami_ids=()):
if ami_ids: images = []
images = [image for image in self.amis.values() if image.id in ami_ids] for ami_id in ami_ids:
for missing_ami in set(ami_ids) - set(ami.id for ami in images): if ami_id in self.amis:
raise InvalidIdError(missing_ami) images.append(self.amis[ami_id])
else: else:
images = self.amis.values() raise InvalidIdError(ami_id)
return images return images or self.amis.values()
def deregister_image(self, ami_id): def deregister_image(self, ami_id):
if ami_id in self.amis: if ami_id in self.amis: