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

Add instance type offerings to manifesti and fix linting

Browse Source
This commit is contained in:
Nuwan Goonasekera 2020-11-23 15:33:57 +05:30
parent 114a8efac8
commit f23ad29810
No known key found for this signature in database
GPG Key ID: 4C28B687668239D8
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MANIFEST.in
View File

@ -1,6 +1,7 @@
include README.md LICENSE AUTHORS.md include README.md LICENSE AUTHORS.md
include requirements.txt requirements-dev.txt tox.ini include requirements.txt requirements-dev.txt tox.ini
include moto/ec2/resources/instance_types.json include moto/ec2/resources/instance_types.json
include moto/ec2/resources/instance_type_offerings.json
include moto/ec2/resources/amis.json include moto/ec2/resources/amis.json
include moto/cognitoidp/resources/*.json include moto/cognitoidp/resources/*.json
include moto/dynamodb2/parsing/reserved_keywords.txt include moto/dynamodb2/parsing/reserved_keywords.txt

1
moto/ec2/exceptions.py
View File

@ -205,6 +205,7 @@ class InvalidInstanceTypeError(EC2ClientError):
"The instance type '{0}' does not exist".format(instance_type), "The instance type '{0}' does not exist".format(instance_type),
) )
class InvalidAMIIdError(EC2ClientError): class InvalidAMIIdError(EC2ClientError):
def __init__(self, ami_id): def __init__(self, ami_id):
super(InvalidAMIIdError, self).__init__( super(InvalidAMIIdError, self).__init__(

2
moto/ec2/resources/instance_type_offerings.json
View File

@ -2127,4 +2127,4 @@
"instance_type": "z1d.xlarge", "instance_type": "z1d.xlarge",
"location": "us-east-1b" "location": "us-east-1b"
} }
] ]

3
moto/ec2/responses/instances.py
View File

@ -1,5 +1,4 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from boto.ec2.instancetype import InstanceType
from moto.autoscaling import autoscaling_backends from moto.autoscaling import autoscaling_backends
from moto.core.responses import BaseResponse from moto.core.responses import BaseResponse
@ -862,4 +861,4 @@ EC2_DESCRIBE_INSTANCE_TYPE_OFFERINGS = """<?xml version="1.0" encoding="UTF-8"?>
</item> </item>
{% endfor %} {% endfor %}
</instanceTypeOfferingSet> </instanceTypeOfferingSet>
</DescribeInstanceTypeOfferingsResponse>""" </DescribeInstanceTypeOfferingsResponse>"""