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

Merge pull request #2837 from bblommers/bug/2810

Browse Source 
EC2 - Explicitly set ebs_optimized to false if not specified
This commit is contained in:
Steve Pulec 2020-04-25 18:44:48 -05:00 committed by GitHub
commit fbc431dbff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ class InstanceResponse(BaseResponse):
private_ip = self._get_param("PrivateIpAddress") private_ip = self._get_param("PrivateIpAddress")
associate_public_ip = self._get_param("AssociatePublicIpAddress") associate_public_ip = self._get_param("AssociatePublicIpAddress")
key_name = self._get_param("KeyName") key_name = self._get_param("KeyName")
ebs_optimized = self._get_param("EbsOptimized") ebs_optimized = self._get_param("EbsOptimized") or False
instance_initiated_shutdown_behavior = self._get_param( instance_initiated_shutdown_behavior = self._get_param(
"InstanceInitiatedShutdownBehavior" "InstanceInitiatedShutdownBehavior"
) )

6
tests/test_ec2/test_instances.py
View File

@ -1335,6 +1335,12 @@ def test_create_instance_ebs_optimized():
instance.load() instance.load()
instance.ebs_optimized.should.be(False) instance.ebs_optimized.should.be(False)
instance = ec2_resource.create_instances(
ImageId="ami-12345678", MaxCount=1, MinCount=1,
)[0]
instance.load()
instance.ebs_optimized.should.be(False)
@mock_ec2 @mock_ec2
def test_run_multiple_instances_in_same_command(): def test_run_multiple_instances_in_same_command():