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

Author: Aaron Sierra

libcloud/dns/drivers/gandi.py

@@ -157,7 +157,7 @@ def _to_record(self, record, zone):
             extra["priority"] = int(split[0])
             value = split[1]
         return Record(
-            id="{}:{}".format(record["type"], record["name"]),
+            id=self.to_default_id(zone, record["name"], record["type"]),
             name=record["name"],
             type=self._string_to_record_type(record["type"]),
             data=value,
@@ -181,15 +181,16 @@ def list_records(self, zone):
 
     def get_record(self, zone_id, record_id):
         zid = int(zone_id)
-        record_type, name = record_id.split(":", 1)
-        filter_opts = {"name": name, "type": record_type}
+        zone = self.get_zone(zone_id)
+        rparts = self.from_default_id(zone, record_id)
+        filter_opts = {"name": rparts.name, "type": rparts.type}
         self.connection.set_context({"zone_id": zone_id})
         records = self.connection.request("domain.zone.record.list", zid, 0, filter_opts).object
 
         if len(records) == 0:
             raise RecordDoesNotExistError(value="", driver=self, record_id=record_id)
 
-        return self._to_record(records[0], self.get_zone(zone_id))
+        return self._to_record(records[0], zone)
 
     def _validate_record(self, record_id, name, record_type, data, extra):
         if len(data) > 1024:

libcloud/test/dns/test_gandi.py

@@ -72,7 +72,7 @@ def test_list_records(self):
 
         record = records[3]
         self.assertEqual(record.name, "")
-        self.assertEqual(record.id, "MX:")
+        self.assertEqual(record.id, "MX")
         self.assertEqual(record.type, RecordType.MX)
         self.assertEqual(record.data, "aspmx.l.google.com")
         self.assertEqual(record.extra["priority"], 15)
@@ -366,7 +366,7 @@ def _xmlrpc__domain_zone_record_list_RECORD_DOES_NOT_EXIST(self, method, url, bo
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
     def _xmlrpc__domain_zone_info_RECORD_DOES_NOT_EXIST(self, method, url, body, headers):
-        body = self.fixtures.load("list_zones.xml")
+        body = self.fixtures.load("get_zone.xml")
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
     def _xmlrpc__domain_zone_record_delete_RECORD_DOES_NOT_EXIST(self, method, url, body, headers):