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

Routes: Fixed vpc_peering_connection_id in describe route tables. (Upgrade: Boto 2.32.1 ~> 2.34.0)

Browse Source
This commit is contained in:
dreadpirateshawn 2014-10-23 11:54:20 -07:00
parent c2cd5b346f
commit b10d16e583
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -4,13 +4,13 @@ python:
- 2.7
env:
matrix:
- BOTO_VERSION=2.32.1
- BOTO_VERSION=2.34.0
- BOTO_VERSION=2.25.0
- BOTO_VERSION=2.7
matrix:
include:
- python: "3.3"
env: BOTO_VERSION=2.32.1
env: BOTO_VERSION=2.34.0
install:
- pip install boto==$BOTO_VERSION
- pip install .

50
tests/test_ec2/test_route_tables.py
View File

@ -218,29 +218,29 @@ def test_routes_not_supported():
conn.replace_route.when.called_with(main_route_table.id, ROUTE_CIDR, interface_id='eni-1234abcd').should.throw(NotImplementedError)
#@requires_boto_gte("2.32.2")
#@mock_ec2
#def test_routes_vpc_peering_connection():
# conn = boto.connect_vpc('the_key', 'the_secret')
# vpc = conn.create_vpc("10.0.0.0/16")
# main_route_table = conn.get_all_route_tables(filters={'association.main':'true','vpc-id':vpc.id})[0]
# local_route = main_route_table.routes[0]
# ROUTE_CIDR = "10.0.0.4/24"
#
# peer_vpc = conn.create_vpc("11.0.0.0/16")
# vpc_pcx = conn.create_vpc_peering_connection(vpc.id, peer_vpc.id)
#
# conn.create_route(main_route_table.id, ROUTE_CIDR, vpc_peering_connection_id=vpc_pcx.id)
#
# # Refresh route table
# main_route_table = conn.get_all_route_tables(main_route_table.id)[0]
# new_routes = [route for route in main_route_table.routes if route.destination_cidr_block != vpc.cidr_block]
# new_routes.should.have.length_of(1)
#
# new_route = new_routes[0]
# new_route.gateway_id.should.be.none
# new_route.instance_id.should.be.none
# new_route.vpc_peering_connection_id.should.equal(vpc_pcx.id)
# new_route.state.should.equal('blackhole')
# new_route.destination_cidr_block.should.equal(ROUTE_CIDR)
@requires_boto_gte("2.34.0")
@mock_ec2
def test_routes_vpc_peering_connection():
conn = boto.connect_vpc('the_key', 'the_secret')
vpc = conn.create_vpc("10.0.0.0/16")
main_route_table = conn.get_all_route_tables(filters={'association.main':'true','vpc-id':vpc.id})[0]
local_route = main_route_table.routes[0]
ROUTE_CIDR = "10.0.0.4/24"
peer_vpc = conn.create_vpc("11.0.0.0/16")
vpc_pcx = conn.create_vpc_peering_connection(vpc.id, peer_vpc.id)
conn.create_route(main_route_table.id, ROUTE_CIDR, vpc_peering_connection_id=vpc_pcx.id)
# Refresh route table
main_route_table = conn.get_all_route_tables(main_route_table.id)[0]
new_routes = [route for route in main_route_table.routes if route.destination_cidr_block != vpc.cidr_block]
new_routes.should.have.length_of(1)
new_route = new_routes[0]
new_route.gateway_id.should.be.none
new_route.instance_id.should.be.none
new_route.vpc_peering_connection_id.should.equal(vpc_pcx.id)
new_route.state.should.equal('blackhole')
new_route.destination_cidr_block.should.equal(ROUTE_CIDR)