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

Linting

Browse Source
This commit is contained in:
Bert Blommers 2020-02-24 13:43:58 +00:00
parent 939bd1cd86
commit 3aeb5f5043
3 changed files with 40 additions and 23 deletions
Show Stats 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: if filters:
applicable = False applicable = False
for f in filters: for f in filters:
acceptable_values = f['values'] acceptable_values = f["values"]
if f['name'] == "instance-state-name": if f["name"] == "instance-state-name":
if self._state.name in acceptable_values: if self._state.name in acceptable_values:
applicable = True applicable = True
if f['name'] == "instance-state-code": if f["name"] == "instance-state-code":
if str(self._state.code) in acceptable_values: if str(self._state.code) in acceptable_values:
applicable = True applicable = True
return applicable return applicable

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

@ -128,10 +128,15 @@ class InstanceResponse(BaseResponse):
instance_ids = self._get_multi_param("InstanceId") instance_ids = self._get_multi_param("InstanceId")
include_all_instances = self._get_param("IncludeAllInstances") == "true" include_all_instances = self._get_param("IncludeAllInstances") == "true"
filters = self._get_list_prefix("Filter") 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: 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: elif include_all_instances:
instances = self.ec2_backend.all_instances(filters) instances = self.ec2_backend.all_instances(filters)
else: else:

48
tests/test_ec2/test_instances.py
View File

@ -1172,12 +1172,12 @@ def test_describe_instance_status_with_instance_filter():
# We want to filter based on this one # We want to filter based on this one
reservation = conn.run_instances(ImageId="ami-1234abcd", MinCount=3, MaxCount=3) reservation = conn.run_instances(ImageId="ami-1234abcd", MinCount=3, MaxCount=3)
instance1 = reservation['Instances'][0] instance1 = reservation["Instances"][0]
instance2 = reservation['Instances'][1] instance2 = reservation["Instances"][1]
instance3 = reservation['Instances'][2] instance3 = reservation["Instances"][2]
conn.stop_instances(InstanceIds=[instance1['InstanceId']]) conn.stop_instances(InstanceIds=[instance1["InstanceId"]])
stopped_instance_ids = [instance1['InstanceId']] stopped_instance_ids = [instance1["InstanceId"]]
running_instance_ids = sorted([instance2['InstanceId'], instance3['InstanceId']]) running_instance_ids = sorted([instance2["InstanceId"], instance3["InstanceId"]])
all_instance_ids = sorted(stopped_instance_ids + running_instance_ids) all_instance_ids = sorted(stopped_instance_ids + running_instance_ids)
# Filter instance using the state name # Filter instance using the state name
@ -1189,16 +1189,22 @@ def test_describe_instance_status_with_instance_filter():
"stopped": [{"Name": "instance-state-name", "Values": ["stopped"]}], "stopped": [{"Name": "instance-state-name", "Values": ["stopped"]}],
} }
found_statuses = conn.describe_instance_status(IncludeAllInstances=True, Filters=state_name_filter["running_and_stopped"])['InstanceStatuses'] found_statuses = conn.describe_instance_status(
found_instance_ids = [status['InstanceId'] for status in found_statuses] IncludeAllInstances=True, Filters=state_name_filter["running_and_stopped"]
)["InstanceStatuses"]
found_instance_ids = [status["InstanceId"] for status in found_statuses]
sorted(found_instance_ids).should.equal(all_instance_ids) sorted(found_instance_ids).should.equal(all_instance_ids)
found_statuses = conn.describe_instance_status(IncludeAllInstances=True, Filters=state_name_filter["running"])['InstanceStatuses'] found_statuses = conn.describe_instance_status(
found_instance_ids = [status['InstanceId'] for status in found_statuses] IncludeAllInstances=True, Filters=state_name_filter["running"]
)["InstanceStatuses"]
found_instance_ids = [status["InstanceId"] for status in found_statuses]
sorted(found_instance_ids).should.equal(running_instance_ids) sorted(found_instance_ids).should.equal(running_instance_ids)
found_statuses = conn.describe_instance_status(IncludeAllInstances=True, Filters=state_name_filter["stopped"])['InstanceStatuses'] found_statuses = conn.describe_instance_status(
found_instance_ids = [status['InstanceId'] for status in found_statuses] IncludeAllInstances=True, Filters=state_name_filter["stopped"]
)["InstanceStatuses"]
found_instance_ids = [status["InstanceId"] for status in found_statuses]
sorted(found_instance_ids).should.equal(stopped_instance_ids) sorted(found_instance_ids).should.equal(stopped_instance_ids)
# Filter instance using the state code # Filter instance using the state code
@ -1210,16 +1216,22 @@ def test_describe_instance_status_with_instance_filter():
"stopped": [{"Name": "instance-state-code", "Values": ["80"]}], "stopped": [{"Name": "instance-state-code", "Values": ["80"]}],
} }
found_statuses = conn.describe_instance_status(IncludeAllInstances=True, Filters=state_code_filter["running_and_stopped"])['InstanceStatuses'] found_statuses = conn.describe_instance_status(
found_instance_ids = [status['InstanceId'] for status in found_statuses] IncludeAllInstances=True, Filters=state_code_filter["running_and_stopped"]
)["InstanceStatuses"]
found_instance_ids = [status["InstanceId"] for status in found_statuses]
sorted(found_instance_ids).should.equal(all_instance_ids) sorted(found_instance_ids).should.equal(all_instance_ids)
found_statuses = conn.describe_instance_status(IncludeAllInstances=True, Filters=state_code_filter["running"])['InstanceStatuses'] found_statuses = conn.describe_instance_status(
found_instance_ids = [status['InstanceId'] for status in found_statuses] IncludeAllInstances=True, Filters=state_code_filter["running"]
)["InstanceStatuses"]
found_instance_ids = [status["InstanceId"] for status in found_statuses]
sorted(found_instance_ids).should.equal(running_instance_ids) sorted(found_instance_ids).should.equal(running_instance_ids)
found_statuses = conn.describe_instance_status(IncludeAllInstances=True, Filters=state_code_filter["stopped"])['InstanceStatuses'] found_statuses = conn.describe_instance_status(
found_instance_ids = [status['InstanceId'] for status in found_statuses] IncludeAllInstances=True, Filters=state_code_filter["stopped"]
)["InstanceStatuses"]
found_instance_ids = [status["InstanceId"] for status in found_statuses]
sorted(found_instance_ids).should.equal(stopped_instance_ids) sorted(found_instance_ids).should.equal(stopped_instance_ids)