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

EC2 - Verify default block exists before tearing down

Browse Source
This commit is contained in:
Bert Blommers 2020-03-20 16:17:21 +00:00
parent 5b596c8a78
commit da1a2118bb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
moto/ec2/models.py
View File

@ -567,9 +567,10 @@ class Instance(TaggedEC2Resource, BotoInstance):
self.ec2_backend.attach_volume(volume.id, self.id, "/dev/sda1") self.ec2_backend.attach_volume(volume.id, self.id, "/dev/sda1")
def teardown_defaults(self): def teardown_defaults(self):
volume_id = self.block_device_mapping["/dev/sda1"].volume_id if "/dev/sda1" in self.block_device_mapping:
self.ec2_backend.detach_volume(volume_id, self.id, "/dev/sda1") volume_id = self.block_device_mapping["/dev/sda1"].volume_id
self.ec2_backend.delete_volume(volume_id) self.ec2_backend.detach_volume(volume_id, self.id, "/dev/sda1")
self.ec2_backend.delete_volume(volume_id)
@property @property
def get_block_device_mapping(self): def get_block_device_mapping(self):