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

Don't create volumes for AMIs (#1456)

Browse source 
* Delete the volume used during AMI creation

Creating an AMI doesn't actually result in the creation of an EBS
volume, although the associated snapshot does reference one. To that
end, delete the volume once we've used it.

* Add `owner_id` to `Snapshot`, verify AMI snapshots

The default AMIs which are created by moto have EBS volume mappings
but the snapshots associated with those don't have the correct
owners set.

This adds the owner to the snapshot model and passes it through from
the JSON data.
This commit is contained in:
Graham Lyons 2018-03-21 15:55:58 +00:00 • committed by Jack Danger
commit 5d51329c34
3 changed files with 54 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

56
tests/test_ec2/test_amis.py
View file

@ -10,6 +10,7 @@ from nose.tools import assert_raises
import sure # noqa
from moto import mock_ec2_deprecated, mock_ec2
from moto.ec2.models import AMIS
from tests.helpers import requires_boto_gte
@ -17,9 +18,9 @@ from tests.helpers import requires_boto_gte
def test_ami_create_and_delete():
conn = boto.connect_ec2('the_key', 'the_secret')
initial_volume_count = 34
conn.get_all_volumes().should.have.length_of(initial_volume_count)
conn.get_all_snapshots().should.have.length_of(initial_volume_count)
initial_ami_count = len(AMIS)
conn.get_all_volumes().should.have.length_of(0)
conn.get_all_snapshots().should.have.length_of(initial_ami_count)
reservation = conn.run_instances('ami-1234abcd')
instance = reservation.instances[0]
@ -47,19 +48,19 @@ def test_ami_create_and_delete():
retrieved_image.creationDate.should_not.be.none
instance.terminate()
# Validate auto-created volume and snapshot
# Ensure we're no longer creating a volume
volumes = conn.get_all_volumes()
volumes.should.have.length_of(initial_volume_count + 1)
volumes.should.have.length_of(0)
# Validate auto-created snapshot
snapshots = conn.get_all_snapshots()
snapshots.should.have.length_of(initial_volume_count + 1)
snapshots.should.have.length_of(initial_ami_count + 1)
retrieved_image_snapshot_id = retrieved_image.block_device_mapping.current_value.snapshot_id
[s.id for s in snapshots].should.contain(retrieved_image_snapshot_id)
snapshot = [s for s in snapshots if s.id == retrieved_image_snapshot_id][0]
snapshot.description.should.equal(
"Auto-created snapshot for AMI {0}".format(retrieved_image.id))
[v.id for v in volumes].should.contain(snapshot.volume_id)
# root device should be in AMI's block device mappings
root_mapping = retrieved_image.block_device_mapping.get(retrieved_image.root_device_name)
@ -88,9 +89,9 @@ def test_ami_create_and_delete():
def test_ami_copy():
conn = boto.ec2.connect_to_region("us-west-1")
initial_volume_count = 34
conn.get_all_volumes().should.have.length_of(initial_volume_count)
conn.get_all_snapshots().should.have.length_of(initial_volume_count)
initial_ami_count = len(AMIS)
conn.get_all_volumes().should.have.length_of(0)
conn.get_all_snapshots().should.have.length_of(initial_ami_count)
reservation = conn.run_instances('ami-1234abcd')
instance = reservation.instances[0]
@ -123,9 +124,11 @@ def test_ami_copy():
copy_image.kernel_id.should.equal(source_image.kernel_id)
copy_image.platform.should.equal(source_image.platform)
# Validate auto-created volume and snapshot
conn.get_all_volumes().should.have.length_of(initial_volume_count + 2)
conn.get_all_snapshots().should.have.length_of(initial_volume_count + 2)
# Ensure we're no longer creating a volume
conn.get_all_volumes().should.have.length_of(0)
# Validate auto-created snapshot
conn.get_all_snapshots().should.have.length_of(initial_ami_count + 2)
copy_image.block_device_mapping.current_value.snapshot_id.should_not.equal(
source_image.block_device_mapping.current_value.snapshot_id)
@ -744,3 +747,30 @@ def test_ami_filter_by_self():
my_images = ec2_client.describe_images(Owners=['self'])['Images']
my_images.should.have.length_of(1)
@mock_ec2
def test_ami_snapshots_have_correct_owner():
ec2_client = boto3.client('ec2', region_name='us-west-1')
images_response = ec2_client.describe_images()
owner_id_to_snapshot_ids = {}
for image in images_response['Images']:
owner_id = image['OwnerId']
snapshot_ids = [
block_device_mapping['Ebs']['SnapshotId']
for block_device_mapping in image['BlockDeviceMappings']
]
existing_snapshot_ids = owner_id_to_snapshot_ids.get(owner_id, [])
owner_id_to_snapshot_ids[owner_id] = (
existing_snapshot_ids + snapshot_ids
)
for owner_id in owner_id_to_snapshot_ids:
snapshots_rseponse = ec2_client.describe_snapshots(
SnapshotIds=owner_id_to_snapshot_ids[owner_id]
)
for snapshot in snapshots_rseponse['Snapshots']:
assert owner_id == snapshot['OwnerId']