diff --git a/moto/route53/models.py b/moto/route53/models.py index 0ae3947e..39ee4fc6 100644 --- a/moto/route53/models.py +++ b/moto/route53/models.py @@ -16,10 +16,6 @@ class FakeZone: del self.rrsets[name] -class FakeResourceRecord: - def __init__(self, value): - pass - class FakeResourceRecordSet: def __init__(self, name, type, ttl, rrlist): self.name = name diff --git a/moto/route53/responses.py b/moto/route53/responses.py index 92a4d921..c2527320 100644 --- a/moto/route53/responses.py +++ b/moto/route53/responses.py @@ -8,8 +8,8 @@ import dicttoxml def list_or_create_hostzone_response(request, full_url, headers): if request.method == "POST": - r = xmltodict.parse(request.body) - new_zone = route53_backend.create_hosted_zone(r["CreateHostedZoneRequest"]["Name"]) + elements = xmltodict.parse(request.body) + new_zone = route53_backend.create_hosted_zone(elements["CreateHostedZoneRequest"]["Name"]) template = Template(CREATE_HOSTED_ZONE_RESPONSE) return 201, headers, template.render(zone=new_zone) @@ -43,10 +43,10 @@ def rrset_response(request, full_url, headers): return 404, headers, "Zone %s Not Found" % zoneid if method == "POST": - r = xmltodict.parse(request.body) - for k, v in r['ChangeResourceRecordSetsRequest']['ChangeBatch']['Changes'].items(): - action = v['Action'] - rrset = v['ResourceRecordSet'] + elements = xmltodict.parse(request.body) + for key, value in elements['ChangeResourceRecordSetsRequest']['ChangeBatch']['Changes'].items(): + action = value['Action'] + rrset = value['ResourceRecordSet'] if action == 'CREATE': the_zone.add_rrset(rrset["Name"], rrset) @@ -64,12 +64,6 @@ def rrset_response(request, full_url, headers): rrset_list.append(dicttoxml.dicttoxml({"ResourceRecordSet": value}, root=False)) return 200, headers, template.render(rrsets=rrset_list) - - - -def not_implemented_response(request, full_url, headers): - parsed_url = urlparse(full_url) - raise NotImplementedError('handling of %s is not yet implemented' % parsed_url.path) LIST_RRSET_REPONSE = """ diff --git a/moto/route53/urls.py b/moto/route53/urls.py index 6f902e5a..7b76e6b2 100644 --- a/moto/route53/urls.py +++ b/moto/route53/urls.py @@ -1,7 +1,6 @@ import responses url_bases = [ - #"https://route53.amazonaws.com/201\d-\d\d-\d\d/hostedzone", "https://route53.amazonaws.com/201.-..-../hostedzone", ] diff --git a/tests/test_route53/test_route53.py b/tests/test_route53/test_route53.py index 465f3b97..ceffa63e 100644 --- a/tests/test_route53/test_route53.py +++ b/tests/test_route53/test_route53.py @@ -59,11 +59,3 @@ def test_rrset(): rrsets = conn.get_all_rrsets(zoneid) rrsets.should.have.length_of(0) - - - - - - - - \ No newline at end of file