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

Upgrade to boto 2.45 (#803)

Browse Source 
Adds support for additional regions:

* ca-central-1
* eu-west-2

Signed-off-by: Andrew Harris <andrew.harris@getbraintree.com>
This commit is contained in:
Jesse Szwedko 2017-01-18 19:55:22 -08:00 committed by Steve Pulec
parent 82bc502cf7
commit 55f39265dd
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -5,11 +5,11 @@ python:
- 2.7 - 2.7
env: env:
matrix: matrix:
- BOTO_VERSION=2.43.0 - BOTO_VERSION=2.45.0
matrix: matrix:
include: include:
- python: "3.3" - python: "3.3"
env: BOTO_VERSION=2.43.0 env: BOTO_VERSION=2.45.0
install: install:
- travis_retry pip install boto==$BOTO_VERSION - travis_retry pip install boto==$BOTO_VERSION
- travis_retry pip install boto3 - travis_retry pip install boto3

2
moto/ec2/models.py
View File

@ -1092,9 +1092,11 @@ class RegionsAndZonesBackend(object):
Region("ap-south-1", "ec2.ap-south-1.amazonaws.com"), Region("ap-south-1", "ec2.ap-south-1.amazonaws.com"),
Region("ap-southeast-1", "ec2.ap-southeast-1.amazonaws.com"), Region("ap-southeast-1", "ec2.ap-southeast-1.amazonaws.com"),
Region("ap-southeast-2", "ec2.ap-southeast-2.amazonaws.com"), Region("ap-southeast-2", "ec2.ap-southeast-2.amazonaws.com"),
Region("ca-central-1", "ec2.ca-central-1.amazonaws.com.cn"),
Region("cn-north-1", "ec2.cn-north-1.amazonaws.com.cn"), Region("cn-north-1", "ec2.cn-north-1.amazonaws.com.cn"),
Region("eu-central-1", "ec2.eu-central-1.amazonaws.com"), Region("eu-central-1", "ec2.eu-central-1.amazonaws.com"),
Region("eu-west-1", "ec2.eu-west-1.amazonaws.com"), Region("eu-west-1", "ec2.eu-west-1.amazonaws.com"),
Region("eu-west-2", "ec2.eu-west-2.amazonaws.com"),
Region("sa-east-1", "ec2.sa-east-1.amazonaws.com"), Region("sa-east-1", "ec2.sa-east-1.amazonaws.com"),
Region("us-east-1", "ec2.us-east-1.amazonaws.com"), Region("us-east-1", "ec2.us-east-1.amazonaws.com"),
Region("us-east-2", "ec2.us-east-2.amazonaws.com"), Region("us-east-2", "ec2.us-east-2.amazonaws.com"),

4
tests/test_ec2/test_availability_zones_and_regions.py
View File

@ -11,7 +11,7 @@ from moto import mock_ec2
def test_describe_regions(): def test_describe_regions():
conn = boto.connect_ec2('the_key', 'the_secret') conn = boto.connect_ec2('the_key', 'the_secret')
regions = conn.get_all_regions() regions = conn.get_all_regions()
regions.should.have.length_of(14) regions.should.have.length_of(16)
for region in regions: for region in regions:
region.endpoint.should.contain(region.name) region.endpoint.should.contain(region.name)
@ -32,7 +32,7 @@ def test_availability_zones():
def test_boto3_describe_regions(): def test_boto3_describe_regions():
ec2 = boto3.client('ec2', 'us-east-1') ec2 = boto3.client('ec2', 'us-east-1')
resp = ec2.describe_regions() resp = ec2.describe_regions()
resp['Regions'].should.have.length_of(14) resp['Regions'].should.have.length_of(16)
for rec in resp['Regions']: for rec in resp['Regions']:
rec['Endpoint'].should.contain(rec['RegionName']) rec['Endpoint'].should.contain(rec['RegionName'])