kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix snapshot deletion on AMI testing cleanup

Browse source
This commit is contained in:
Anders Ingemann 2015-03-25 21:07:05 +01:00
parent e9736f58a8
commit 694f46923b
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
tests/integration/images/ami.py
View file

@ -9,20 +9,22 @@ def initialize_image(manifest, credentials, bootstrap_info):
connection = connect_to_region(bootstrap_info._ec2['region'], connection = connect_to_region(bootstrap_info._ec2['region'],
aws_access_key_id=credentials['access-key'], aws_access_key_id=credentials['access-key'],
aws_secret_access_key=credentials['secret-key']) aws_secret_access_key=credentials['secret-key'])
ami = connection.get_image(bootstrap_info._ec2['image']) image = AmazonMachineImage(manifest, bootstrap_info._ec2['image'], connection)
image = AmazonMachineImage(manifest, ami)
return image return image
class AmazonMachineImage(Image): class AmazonMachineImage(Image):
def __init__(self, manifest, ami): def __init__(self, manifest, image_id, connection):
super(AmazonMachineImage, self).__init__(manifest) super(AmazonMachineImage, self).__init__(manifest)
self.ami = ami self.ami = connection.get_image(image_id)
self.connection = connection
def destroy(self): def destroy(self):
log.debug('Deleting AMI') log.debug('Deleting AMI')
self.ami.deregister(delete_snapshot=True) self.ami.deregister()
for device, block_device_type in self.ami.block_device_mapping.items():
self.connection.delete_snapshot(block_device_type.snapshot_id)
del self.ami del self.ami
@contextmanager @contextmanager