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

Make availability zone dynamic in Subnet Response templates

Browse Source
This commit is contained in:
Hugo Lopes Tavares 2015-04-08 16:47:43 -04:00
parent 56cb06041c
commit 65d51a5844
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/ec2/responses/subnets.py
View File

@ -41,7 +41,7 @@ CREATE_SUBNET_RESPONSE = """
<vpcId>{{ subnet.vpc_id }}</vpcId> <vpcId>{{ subnet.vpc_id }}</vpcId>
<cidrBlock>{{ subnet.cidr_block }}</cidrBlock> <cidrBlock>{{ subnet.cidr_block }}</cidrBlock>
<availableIpAddressCount>251</availableIpAddressCount> <availableIpAddressCount>251</availableIpAddressCount>
<availabilityZone>us-east-1a</availabilityZone> <availabilityZone>{{ subnet.availability_zone }}</availabilityZone>
<tagSet> <tagSet>
{% for tag in subnet.get_tags() %} {% for tag in subnet.get_tags() %}
<item> <item>
@ -72,7 +72,7 @@ DESCRIBE_SUBNETS_RESPONSE = """
<vpcId>{{ subnet.vpc_id }}</vpcId> <vpcId>{{ subnet.vpc_id }}</vpcId>
<cidrBlock>{{ subnet.cidr_block }}</cidrBlock> <cidrBlock>{{ subnet.cidr_block }}</cidrBlock>
<availableIpAddressCount>251</availableIpAddressCount> <availableIpAddressCount>251</availableIpAddressCount>
<availabilityZone>us-east-1a</availabilityZone> <availabilityZone>{{ subnet.availability_zone }}</availabilityZone>
<tagSet> <tagSet>
{% for tag in subnet.get_tags() %} {% for tag in subnet.get_tags() %}
<item> <item>

8
tests/test_ec2/test_subnets.py
View File

@ -61,6 +61,14 @@ def test_subnet_tagging():
subnet.tags["a key"].should.equal("some value") subnet.tags["a key"].should.equal("some value")
@mock_ec2
def test_subnet_should_have_proper_availability_zone_set():
conn = boto.vpc.connect_to_region('us-west-1')
vpcA = conn.create_vpc("10.0.0.0/16")
subnetA = conn.create_subnet(vpcA.id, "10.0.0.0/24", availability_zone='us-west-1b')
subnetA.availability_zone.should.equal('us-west-1b')
@mock_ec2 @mock_ec2
def test_get_subnets_filtering(): def test_get_subnets_filtering():
conn = boto.vpc.connect_to_region('us-west-1') conn = boto.vpc.connect_to_region('us-west-1')