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

Merge pull request #1989 from jrbeilke/bugfix-ec2_ami_is-public

Browse Source 
Bugfix for filtering EC2 AMIs with is-public (values should be lowercase)
This commit is contained in:
Steve Pulec 2018-12-28 21:22:28 -05:00 committed by GitHub
commit 93f68090e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
moto/ec2/models.py
View File

@ -1115,7 +1115,7 @@ class Ami(TaggedEC2Resource):
elif filter_name == 'image-id': elif filter_name == 'image-id':
return self.id return self.id
elif filter_name == 'is-public': elif filter_name == 'is-public':
return str(self.is_public) return self.is_public_string
elif filter_name == 'state': elif filter_name == 'state':
return self.state return self.state
elif filter_name == 'name': elif filter_name == 'name':

4
tests/test_ec2/test_amis.py
View File

@ -258,11 +258,11 @@ def test_ami_filters():
amis_by_name = conn.get_all_images(filters={'name': imageA.name}) amis_by_name = conn.get_all_images(filters={'name': imageA.name})
set([ami.id for ami in amis_by_name]).should.equal(set([imageA.id])) set([ami.id for ami in amis_by_name]).should.equal(set([imageA.id]))
amis_by_public = conn.get_all_images(filters={'is-public': True}) amis_by_public = conn.get_all_images(filters={'is-public': 'true'})
set([ami.id for ami in amis_by_public]).should.contain(imageB.id) set([ami.id for ami in amis_by_public]).should.contain(imageB.id)
len(amis_by_public).should.equal(35) len(amis_by_public).should.equal(35)
amis_by_nonpublic = conn.get_all_images(filters={'is-public': False}) amis_by_nonpublic = conn.get_all_images(filters={'is-public': 'false'})
set([ami.id for ami in amis_by_nonpublic]).should.contain(imageA.id) set([ami.id for ami in amis_by_nonpublic]).should.contain(imageA.id)
len(amis_by_nonpublic).should.equal(1) len(amis_by_nonpublic).should.equal(1)