dns: route53: Leverage common code

Leverage common code from DNSDriver, Record, and Zone classes for host
name and record ID handling.

Author: Aaron Sierra

libcloud/dns/drivers/route53.py

@@ -129,14 +129,11 @@ def get_zone(self, zone_id):
 
     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
+        rparts = self.from_default_id(zone, record_id)
         self.connection.set_context({"zone_id": zone_id})
-        params = urlencode({"name": full_name, "type": record_type, "maxitems": "1"})
+        params = urlencode(
+            {"name": zone.hostname(rparts.name), "type": rparts.type, "maxitems": "1"}
+        )
         uri = API_ROOT + "hostedzone/" + zone_id + "/rrset?" + params
         data = self.connection.request(uri).object
 
@@ -145,9 +142,9 @@ def get_record(self, zone_id, record_id):
         # A cute aspect of the /rrset filters is that they are more pagination
         # hints than filters!!
         # So will return a result even if its not what you asked for.
-        record_type_num = self._string_to_record_type(record_type)
+        record_type_num = self._string_to_record_type(rparts.type)
 
-        if record.name != name or record.type != record_type_num:
+        if record.name != rparts.name or record.type != record_type_num:
             raise RecordDoesNotExistError(value="", driver=self, record_id=record_id)
 
         return record
@@ -186,10 +183,9 @@ def create_record(self, name, zone, type, data, extra=None):
         extra = extra or {}
         batch = [("CREATE", name, type, data, extra)]
         self._post_changeset(zone, batch)
-        id = ":".join((self.RECORD_TYPE_MAP[type], name))
 
         return Record(
-            id=id,
+            id=self.to_default_id(zone, name, type),
             name=name,
             type=type,
             data=data,
@@ -221,10 +217,8 @@ def update_record(self, record, name=None, type=None, data=None, extra=None):
                 record=record, name=name, type=type, data=data, extra=extra
             )
 
-        id = ":".join((self.RECORD_TYPE_MAP[type], name))
-
         return Record(
-            id=id,
+            id=self.to_default_id(record.zone, name, type),
             name=name,
             type=type,
             data=data,
@@ -262,7 +256,7 @@ def ex_create_multi_value_record(self, name, zone, type, data, extra=None):
         ET.SubElement(change, "Action").text = "CREATE"
 
         rrs = ET.SubElement(change, "ResourceRecordSet")
-        ET.SubElement(rrs, "Name").text = name + "." + zone.domain
+        ET.SubElement(rrs, "Name").text = zone.hostname(name)
         ET.SubElement(rrs, "Type").text = self.RECORD_TYPE_MAP[type]
         ET.SubElement(rrs, "TTL").text = str(extra.get("ttl", "0"))
 
@@ -280,13 +274,11 @@ def ex_create_multi_value_record(self, name, zone, type, data, extra=None):
         self.connection.set_context({"zone_id": zone.id})
         self.connection.request(uri, method="POST", data=data)
 
-        id = ":".join((self.RECORD_TYPE_MAP[type], name))
-
         records = []
 
         for value in values:
             record = Record(
-                id=id,
+                id=self.to_default_id(zone, name, type),
                 name=name,
                 type=type,
                 data=value,
@@ -338,12 +330,7 @@ def _update_multi_value_record(self, record, name=None, type=None, data=None, ex
 
         rrs = ET.SubElement(change, "ResourceRecordSet")
 
-        if record.name:
-            record_name = record.name + "." + record.zone.domain
-        else:
-            record_name = record.zone.domain
-
-        ET.SubElement(rrs, "Name").text = record_name
+        ET.SubElement(rrs, "Name").text = record.hostname
         ET.SubElement(rrs, "Type").text = self.RECORD_TYPE_MAP[record.type]
         ET.SubElement(rrs, "TTL").text = str(record.extra.get("ttl", "0"))
 
@@ -363,12 +350,7 @@ def _update_multi_value_record(self, record, name=None, type=None, data=None, ex
 
         rrs = ET.SubElement(change, "ResourceRecordSet")
 
-        if name:
-            record_name = name + "." + record.zone.domain
-        else:
-            record_name = record.zone.domain
-
-        ET.SubElement(rrs, "Name").text = record_name
+        ET.SubElement(rrs, "Name").text = record.zone.hostname(name)
         ET.SubElement(rrs, "Type").text = self.RECORD_TYPE_MAP[type]
         ET.SubElement(rrs, "TTL").text = str(extra.get("ttl", "0"))
 
@@ -399,12 +381,7 @@ def _post_changeset(self, zone, changes_list):
 
             rrs = ET.SubElement(change, "ResourceRecordSet")
 
-            if name:
-                record_name = name + "." + zone.domain
-            else:
-                record_name = zone.domain
-
-            ET.SubElement(rrs, "Name").text = record_name
+            ET.SubElement(rrs, "Name").text = zone.hostname(name)
             ET.SubElement(rrs, "Type").text = self.RECORD_TYPE_MAP[type_]
             ET.SubElement(rrs, "TTL").text = str(extra.get("ttl", "0"))
 
@@ -528,9 +505,8 @@ def _to_record(self, elem, zone, index=0):
             extra["weight"] = int(weight)
             extra["port"] = int(port)
 
-        id = ":".join((self.RECORD_TYPE_MAP[type], name))
         record = Record(
-            id=id,
+            id=self.to_default_id(zone, name, type),
             name=name,
             type=type,
             data=data,

libcloud/test/dns/test_route53.py

@@ -196,7 +196,7 @@ def test_create_record_zone_name(self):
         self.assertIn("<Value>127.0.0.1</Value>", xml)
         self.assertIn("<TTL>0</TTL>", xml)
 
-        self.assertEqual(record.id, "A:")
+        self.assertEqual(record.id, "A")
         self.assertEqual(record.name, "")
         self.assertEqual(record.zone, zone)
         self.assertEqual(record.type, RecordType.A)
@@ -208,7 +208,7 @@ def test_create_TXT_record(self):
         """
         zone = self.driver.list_zones()[0]
         record = self.driver.create_record(name="", zone=zone, type=RecordType.TXT, data="test")
-        self.assertEqual(record.id, "TXT:")
+        self.assertEqual(record.id, "TXT")
         self.assertEqual(record.name, "")
         self.assertEqual(record.zone, zone)
         self.assertEqual(record.type, RecordType.TXT)
@@ -220,7 +220,7 @@ def test_create_TXT_record_quoted(self):
         """
         zone = self.driver.list_zones()[0]
         record = self.driver.create_record(name="", zone=zone, type=RecordType.TXT, data='"test"')
-        self.assertEqual(record.id, "TXT:")
+        self.assertEqual(record.id, "TXT")
         self.assertEqual(record.name, "")
         self.assertEqual(record.zone, zone)
         self.assertEqual(record.type, RecordType.TXT)
@@ -232,7 +232,7 @@ def test_create_SPF_record(self):
         """
         zone = self.driver.list_zones()[0]
         record = self.driver.create_record(name="", zone=zone, type=RecordType.SPF, data="test")
-        self.assertEqual(record.id, "SPF:")
+        self.assertEqual(record.id, "SPF")
         self.assertEqual(record.name, "")
         self.assertEqual(record.zone, zone)
         self.assertEqual(record.type, RecordType.SPF)
@@ -244,7 +244,7 @@ def test_create_SPF_record_quoted(self):
         """
         zone = self.driver.list_zones()[0]
         record = self.driver.create_record(name="", zone=zone, type=RecordType.SPF, data='"test"')
-        self.assertEqual(record.id, "SPF:")
+        self.assertEqual(record.id, "SPF")
         self.assertEqual(record.name, "")
         self.assertEqual(record.zone, zone)
         self.assertEqual(record.type, RecordType.SPF)
@@ -258,7 +258,7 @@ def test_create_TXT_record_escaped(self):
         record = self.driver.create_record(
             name="", zone=zone, type=RecordType.TXT, data='test "with"'
         )
-        self.assertEqual(record.id, "TXT:")
+        self.assertEqual(record.id, "TXT")
         self.assertEqual(record.name, "")
         self.assertEqual(record.zone, zone)
         self.assertEqual(record.type, RecordType.TXT)