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

Merge pull request #413 from jszwedko/master

Browse Source 
Add support for latency based route53 records
This commit is contained in:
Steve Pulec 2015-09-19 09:03:38 -04:00
commit d58afc13fd
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
moto/route53/models.py
View File

@ -68,6 +68,7 @@ class RecordSet(object):
self.records = kwargs.get('ResourceRecords', []) self.records = kwargs.get('ResourceRecords', [])
self.set_identifier = kwargs.get('SetIdentifier') self.set_identifier = kwargs.get('SetIdentifier')
self.weight = kwargs.get('Weight') self.weight = kwargs.get('Weight')
self.region = kwargs.get('Region')
self.health_check = kwargs.get('HealthCheckId') self.health_check = kwargs.get('HealthCheckId')
@classmethod @classmethod
@ -89,6 +90,9 @@ class RecordSet(object):
{% if record_set.weight %} {% if record_set.weight %}
<Weight>{{ record_set.weight }}</Weight> <Weight>{{ record_set.weight }}</Weight>
{% endif %} {% endif %}
{% if record_set.region %}
<Region>{{ record_set.region }}</Region>
{% endif %}
<TTL>{{ record_set.ttl }}</TTL> <TTL>{{ record_set.ttl }}</TTL>
<ResourceRecords> <ResourceRecords>
{% for record in record_set.records %} {% for record in record_set.records %}

22
tests/test_route53/test_route53.py
View File

@ -239,3 +239,25 @@ def test_deleting_weighted_route():
cname = zone.get_cname('cname.testdns.aws.com.', all=True) cname = zone.get_cname('cname.testdns.aws.com.', all=True)
# When get_cname only had one result, it returns just that result instead of a list. # When get_cname only had one result, it returns just that result instead of a list.
cname.identifier.should.equal('success-test-bar') cname.identifier.should.equal('success-test-bar')
@mock_route53
def test_deleting_latency_route():
conn = boto.connect_route53()
conn.create_hosted_zone("testdns.aws.com.")
zone = conn.get_zone("testdns.aws.com.")
zone.add_cname("cname.testdns.aws.com", "example.com", identifier=('success-test-foo', 'us-west-2'))
zone.add_cname("cname.testdns.aws.com", "example.com", identifier=('success-test-bar', 'us-west-1'))
cnames = zone.get_cname('cname.testdns.aws.com.', all=True)
cnames.should.have.length_of(2)
foo_cname = [cname for cname in cnames if cname.identifier == 'success-test-foo'][0]
foo_cname.region.should.equal('us-west-2')
zone.delete_record(foo_cname)
cname = zone.get_cname('cname.testdns.aws.com.', all=True)
# When get_cname only had one result, it returns just that result instead of a list.
cname.identifier.should.equal('success-test-bar')
cname.region.should.equal('us-west-1')