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

Fix prebuilt images usability. (#1375)

Browse Source 
- add a better error message when user uses an unknown ami
- add image_location in the default fake images

Fixes #1372
This commit is contained in:
Pierre Tardy 2017-12-05 10:22:13 +01:00 committed by Terry Cain
parent 97687d153a
commit d8f6f77a0f
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/ec2/models.py
View File

@ -392,7 +392,9 @@ class Instance(TaggedEC2Resource, BotoInstance):
if ami is None: if ami is None:
warnings.warn('Could not find AMI with image-id:{0}, ' warnings.warn('Could not find AMI with image-id:{0}, '
'in the near future this will ' 'in the near future this will '
'cause an error'.format(image_id), 'cause an error.\n'
'Use ec2_backend.describe_images() to'
'find suitable image for your test'.format(image_id),
PendingDeprecationWarning) PendingDeprecationWarning)
self.platform = ami.platform if ami else None self.platform = ami.platform if ami else None

34
moto/ec2/resources/amis.json
View File

@ -4,6 +4,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -20,6 +21,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -36,6 +38,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -52,6 +55,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "099720109477", "owner_id": "099720109477",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -68,6 +72,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -84,6 +89,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -100,6 +106,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -116,6 +123,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "013907871322", "owner_id": "013907871322",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -132,6 +140,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -148,6 +157,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -163,6 +173,7 @@
"ami_id": "ami-56ec3e2f", "ami_id": "ami-56ec3e2f",
"state": "available", "state": "available",
"public": true, "public": true,
"image_location": "amazon/getting-started",
"owner_id": "801119661308", "owner_id": "801119661308",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
@ -180,6 +191,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -196,6 +208,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -212,6 +225,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "137112412989", "owner_id": "137112412989",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/xvda", "root_device_name": "/dev/xvda",
@ -228,6 +242,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -244,6 +259,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "099720109477", "owner_id": "099720109477",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -260,6 +276,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "137112412989", "owner_id": "137112412989",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -276,6 +293,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -292,6 +310,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -308,6 +327,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "898082745236", "owner_id": "898082745236",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/xvda", "root_device_name": "/dev/xvda",
@ -324,6 +344,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "898082745236", "owner_id": "898082745236",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -340,6 +361,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -356,6 +378,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -372,6 +395,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -388,6 +412,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "309956199498", "owner_id": "309956199498",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -404,6 +429,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -420,6 +446,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -436,6 +463,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -452,6 +480,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -468,6 +497,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "898082745236", "owner_id": "898082745236",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -484,6 +514,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -500,6 +531,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "801119661308", "owner_id": "801119661308",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda1", "root_device_name": "/dev/sda1",
@ -516,6 +548,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "898082745236", "owner_id": "898082745236",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/xvda", "root_device_name": "/dev/xvda",
@ -532,6 +565,7 @@
"state": "available", "state": "available",
"public": true, "public": true,
"owner_id": "013907871322", "owner_id": "013907871322",
"image_location": "amazon/getting-started",
"sriov": "simple", "sriov": "simple",
"root_device_type": "ebs", "root_device_type": "ebs",
"root_device_name": "/dev/sda", "root_device_name": "/dev/sda",