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

With @ethome, add filtering of instances by security group id

Browse source
This commit is contained in:
Cameron Rowshanbin 2014-12-10 11:53:40 -06:00
commit 573a73aa01
2 changed files with 27 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
moto/ec2/utils.py
View file

@ -324,16 +324,20 @@ filter_dict_attribute_mapping = {
'state-reason-code': '_state_reason.code',
'source-dest-check': 'source_dest_check',
'vpc-id': 'vpc_id',
'group-id': 'security_groups',
'instance.group-id': 'security_groups'
}
def passes_filter_dict(instance, filter_dict):
for filter_name, filter_values in filter_dict.items():
if filter_name in filter_dict_attribute_mapping:
instance_attr = filter_dict_attribute_mapping[filter_name]
instance_value = get_object_value(instance, instance_attr)
if instance_value not in filter_values:
if not instance_value_in_filter_values(instance_value, filter_values):
return False
elif is_tag_filter(filter_name):
if not tag_filter_matches(instance, filter_name, filter_values):
return False
@ -343,6 +347,13 @@ def passes_filter_dict(instance, filter_dict):
filter_name)
return True
def instance_value_in_filter_values(instance_value, filter_values):
if isinstance(instance_value, list):
if not set(filter_values).intersection(set(instance_value)):
return False
elif instance_value not in filter_values:
return False
return True
def filter_reservations(reservations, filter_dict):
result = []