diff --git a/MANIFEST.in b/MANIFEST.in index 51d1b223c..6f38bf3c1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ include README.md LICENSE AUTHORS.md include requirements.txt requirements-dev.txt tox.ini include moto/ec2/resources/instance_types.json +include moto/ec2/resources/instance_type_offerings.json include moto/ec2/resources/amis.json include moto/cognitoidp/resources/*.json include moto/dynamodb2/parsing/reserved_keywords.txt diff --git a/moto/ec2/exceptions.py b/moto/ec2/exceptions.py index e4bbbafb9..022a19c67 100644 --- a/moto/ec2/exceptions.py +++ b/moto/ec2/exceptions.py @@ -205,6 +205,7 @@ class InvalidInstanceTypeError(EC2ClientError): "The instance type '{0}' does not exist".format(instance_type), ) + class InvalidAMIIdError(EC2ClientError): def __init__(self, ami_id): super(InvalidAMIIdError, self).__init__( diff --git a/moto/ec2/resources/instance_type_offerings.json b/moto/ec2/resources/instance_type_offerings.json index 2048be5f7..404d3e9ba 100644 --- a/moto/ec2/resources/instance_type_offerings.json +++ b/moto/ec2/resources/instance_type_offerings.json @@ -2127,4 +2127,4 @@ "instance_type": "z1d.xlarge", "location": "us-east-1b" } -] \ No newline at end of file +] diff --git a/moto/ec2/responses/instances.py b/moto/ec2/responses/instances.py index 0f62ff842..d3df45ed4 100644 --- a/moto/ec2/responses/instances.py +++ b/moto/ec2/responses/instances.py @@ -1,5 +1,4 @@ from __future__ import unicode_literals -from boto.ec2.instancetype import InstanceType from moto.autoscaling import autoscaling_backends from moto.core.responses import BaseResponse @@ -862,4 +861,4 @@ EC2_DESCRIBE_INSTANCE_TYPE_OFFERINGS = """ {% endfor %} -""" \ No newline at end of file +"""