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

Linting

Browse source
This commit is contained in:
Bert Blommers 2020-02-24 13:43:58 +00:00
commit 3aeb5f5043
3 changed files with 40 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
moto/ec2/models.py
View file

@ -826,11 +826,11 @@ class Instance(TaggedEC2Resource, BotoInstance):
if filters:
applicable = False
for f in filters:
acceptable_values = f['values']
if f['name'] == "instance-state-name":
acceptable_values = f["values"]
if f["name"] == "instance-state-name":
if self._state.name in acceptable_values:
applicable = True
if f['name'] == "instance-state-code":
if f["name"] == "instance-state-code":
if str(self._state.code) in acceptable_values:
applicable = True
return applicable

9
moto/ec2/responses/instances.py
View file

@ -128,10 +128,15 @@ class InstanceResponse(BaseResponse):
instance_ids = self._get_multi_param("InstanceId")
include_all_instances = self._get_param("IncludeAllInstances") == "true"
filters = self._get_list_prefix("Filter")
filters = [{'name': f['name'], 'values': self._get_list_of_dict_params("value.", f)} for f in filters]
filters = [
{"name": f["name"], "values": self._get_list_of_dict_params("value.", f)}
for f in filters
]
if instance_ids:
instances = self.ec2_backend.get_multi_instances_by_id(instance_ids, filters)
instances = self.ec2_backend.get_multi_instances_by_id(
instance_ids, filters
)
elif include_all_instances:
instances = self.ec2_backend.all_instances(filters)
else: