dns: gandi_live: Leverage {to,from}_default_id()

Author: Aaron Sierra

libcloud/dns/drivers/gandi_live.py

@@ -146,15 +146,16 @@ def list_records(self, zone):
     """
 
     def get_record(self, zone_id, record_id):
-        record_type, name = record_id.split(":", 1)
-        action = "{}/domains/{}/records/{}/{}".format(API_BASE, zone_id, name, record_type)
+        zone = self.get_zone(zone_id)
+        rparts = self.from_default_id(zone, record_id)
+        action = "{}/domains/{}/records/{}/{}".format(API_BASE, zone_id, rparts.name, rparts.type)
         try:
             record = self.connection.request(action=action, method="GET")
         except ResourceNotFoundError:
             raise RecordDoesNotExistError(
                 value="", driver=self.connection.driver, record_id=record_id
             )
-        return self._to_record(record.object, self.get_zone(zone_id))[0]
+        return self._to_record(record.object, zone)[0]
 
     def create_record(self, name, zone, type, data, extra=None):
         self._validate_record(None, name, type, data, extra)
@@ -420,7 +421,7 @@ def _to_record_sub(self, data, zone, value):
             priority, value = value.split()
             extra["priority"] = priority
         return Record(
-            id="{}:{}".format(data["rrset_type"], data["rrset_name"]),
+            id=self.to_default_id(zone, data["rrset_name"], data["rrset_type"]),
             name=data["rrset_name"],
             type=self._string_to_record_type(data["rrset_type"]),
             data=value,

libcloud/test/dns/test_gandi_live.py

@@ -169,9 +169,7 @@ def test_list_records(self):
     def test_get_record(self):
         record = self.driver.get_record(self.test_zone.id, "A:bob")
 
-        # [0] /api/v5/domains/example.com/records/bob/A
-        # [1] /api/v5/domains/example.com
-        sent = GandiLiveMockHttp.history.pop(0)
+        sent = GandiLiveMockHttp.history.pop()
         self.assertEqual(sent.method, "GET")
         self.assertEqual(sent.url, "/api/v5/domains/example.com/records/bob/A")