catalin/moto
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

make get_all_security_groups filter AND match group ids, not OR them (#822)

Browse source
This commit is contained in:
David Wilcox 2017-02-09 13:29:37 +11:00 • committed by Steve Pulec
commit 012dd497f2
2 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
moto/ec2/models.py
View file

@ -1309,10 +1309,12 @@ class SecurityGroupBackend(object):
if group_ids or groupnames or filters:
for group in all_groups:
if ((group_ids and group.id in group_ids) or
(groupnames and group.name in groupnames) or
(filters and group.matches_filters(filters))):
groups.append(group)
if ((group_ids and not group.id in group_ids) or
(groupnames and not group.name in groupnames)):
continue
if filters and not group.matches_filters(filters):
continue
groups.append(group)
else:
groups = all_groups