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

Fix route53 multiple values bug. Closes #358.

Browse Source
This commit is contained in:
Steve Pulec 2015-06-05 21:29:20 -04:00
parent 7ec3f13597
commit 57f1199b35
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
moto/route53/responses.py
View File

@ -55,7 +55,11 @@ def rrset_response(request, full_url, headers):
action = value['Action'] action = value['Action']
record_set = value['ResourceRecordSet'] record_set = value['ResourceRecordSet']
if action == 'CREATE': if action == 'CREATE':
record_set['ResourceRecords'] = [x['Value'] for x in record_set['ResourceRecords'].values()] resource_records = record_set['ResourceRecords'].values()[0]
if not isinstance(resource_records, list):
# Depending on how many records there are, this may or may not be a list
resource_records = [resource_records]
record_set['ResourceRecords'] = [x['Value'] for x in resource_records]
the_zone.add_rrset(record_set) the_zone.add_rrset(record_set)
elif action == "DELETE": elif action == "DELETE":
if 'SetIdentifier' in record_set: if 'SetIdentifier' in record_set:

17
tests/test_route53/test_route53.py
View File

@ -92,6 +92,23 @@ def test_rrset():
rrsets.should.have.length_of(0) rrsets.should.have.length_of(0)
@mock_route53
def test_rrset_with_multiple_values():
conn = boto.connect_route53('the_key', 'the_secret')
zone = conn.create_hosted_zone("testdns.aws.com")
zoneid = zone["CreateHostedZoneResponse"]["HostedZone"]["Id"].split("/")[-1]
changes = ResourceRecordSets(conn, zoneid)
change = changes.add_change("CREATE", "foo.bar.testdns.aws.com", "A")
change.add_value("1.2.3.4")
change.add_value("5.6.7.8")
changes.commit()
rrsets = conn.get_all_rrsets(zoneid, type="A")
rrsets.should.have.length_of(1)
set(rrsets[0].resource_records).should.equal(set(['1.2.3.4', '5.6.7.8']))
@mock_route53 @mock_route53
def test_create_health_check(): def test_create_health_check():
conn = boto.connect_route53('the_key', 'the_secret') conn = boto.connect_route53('the_key', 'the_secret')