You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2013/01/28 06:14:28 UTC
svn commit: r1439256 - in /libcloud/branches/0.12.x: ./
libcloud/dns/drivers/route53.py
Author: tomaz
Date: Mon Jan 28 05:14:28 2013
New Revision: 1439256
URL: http://svn.apache.org/viewvc?rev=1439256&view=rev
Log:
Backport commit r1439254 from trunk.
Modified:
libcloud/branches/0.12.x/ (props changed)
libcloud/branches/0.12.x/libcloud/dns/drivers/route53.py
Propchange: libcloud/branches/0.12.x/
------------------------------------------------------------------------------
Merged /libcloud/trunk:r1439253-1439255
Modified: libcloud/branches/0.12.x/libcloud/dns/drivers/route53.py
URL: http://svn.apache.org/viewvc/libcloud/branches/0.12.x/libcloud/dns/drivers/route53.py?rev=1439256&r1=1439255&r2=1439256&view=diff
==============================================================================
--- libcloud/branches/0.12.x/libcloud/dns/drivers/route53.py (original)
+++ libcloud/branches/0.12.x/libcloud/dns/drivers/route53.py Mon Jan 28 05:14:28 2013
@@ -134,8 +134,16 @@ class Route53DNSDriver(DNSDriver):
def get_record(self, zone_id, record_id):
zone = self.get_zone(zone_id=zone_id)
record_type, name = record_id.split(':', 1)
+ if name:
+ full_name = ".".join((name, zone.domain))
+ else:
+ full_name = zone.domain
self.connection.set_context({'zone_id': zone_id})
- params = urlencode({'name': name, 'type': record_type})
+ params = urlencode({
+ 'name': full_name,
+ 'type': record_type,
+ 'maxitems': '1'
+ })
uri = API_ROOT + 'hostedzone/' + zone_id + '/rrset?' + params
data = self.connection.request(uri).object
@@ -232,7 +240,7 @@ class Route53DNSDriver(DNSDriver):
rrs = ET.SubElement(change, 'ResourceRecordSet')
ET.SubElement(rrs, 'Name').text = name + "." + zone.domain
ET.SubElement(rrs, 'Type').text = self.RECORD_TYPE_MAP[type_]
- ET.SubElement(rrs, 'TTL').text = extra.get('ttl', '0')
+ ET.SubElement(rrs, 'TTL').text = str(extra.get('ttl', '0'))
rrecs = ET.SubElement(rrs, 'ResourceRecords')
rrec = ET.SubElement(rrecs, 'ResourceRecord')