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

Merge pull request #592 from aiell0/hotifx/add-additional-instance-filters-issue-581

Browse source 
Added ec2 describe-instances filter: 'architecture'
This commit is contained in:
Steve Pulec 2016-04-23 19:40:15 -04:00
commit 224e92ba17
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
moto/ec2/utils.py
View file

@ -361,15 +361,15 @@ filter_dict_attribute_mapping = {
'group-id': 'security_groups',
'instance.group-id': 'security_groups',
'instance-type': 'instance_type',
'private-ip-address' : 'private_ip',
'ip-address' : 'public_ip',
'availability-zone' :'placement'
'private-ip-address': 'private_ip',
'ip-address': 'public_ip',
'availability-zone': 'placement',
'architecture': 'architecture'
}
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)
@ -381,7 +381,7 @@ def passes_filter_dict(instance, filter_dict):
return False
else:
raise NotImplementedError(
"Filter dicts have not been implemented in Moto for '%s' yet. Feel free to open an issue at https://github.com/spulec/moto/issues",
"Filter dicts have not been implemented in Moto for '%s' yet. Feel free to open an issue at https://github.com/spulec/moto/issues" %
filter_name)
return True