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

Author: Aaron Sierra

libcloud/dns/drivers/google.py

@@ -134,11 +134,12 @@ def get_record(self, zone_id, record_id):
 
         :rtype: :class:`Record`
         """
-        (record_type, record_name) = record_id.split(":", 1)
+        zone = self.get_zone(zone_id)
+        parts = self.from_default_id(zone, record_id)
 
         params = {
-            "name": record_name,
-            "type": record_type,
+            "name": parts.name,
+            "type": parts.type,
         }
 
         request = "/managedZones/%s/rrsets" % (zone_id)
@@ -149,8 +150,6 @@ def get_record(self, zone_id, record_id):
             raise ZoneDoesNotExistError(value="", driver=self.connection.driver, zone_id=zone_id)
 
         if len(response["rrsets"]) > 0:
-            zone = self.get_zone(zone_id)
-
             return self._to_record(response["rrsets"][0], zone)
 
         raise RecordDoesNotExistError(value="", driver=self.connection.driver, record_id=record_id)
@@ -386,10 +385,8 @@ def _to_records(self, response, zone):
         return records
 
     def _to_record(self, r, zone):
-        record_id = "{}:{}".format(r["type"], r["name"])
-
         return Record(
-            id=record_id,
+            id=self.to_default_id(zone, r["name"], r["type"]),
             name=r["name"],
             type=r["type"],
             data=r,

libcloud/test/dns/test_google.py

@@ -85,15 +85,15 @@ def test_get_record(self):
         zone = self.driver.list_zones()[0]
         GoogleDNSMockHttp.history.clear()
 
-        record = self.driver.get_record(zone.id, "A:foo.example.com.")
+        record = self.driver.get_record(zone.id, "A:foo")
 
-	# [0] /dns/v1/projects/project_name/managedZones/{zone.id}/rrsets
-	# [1] /dns/v1/projects/project_name/managedZones/{zone.id}
-        sent = GoogleDNSMockHttp.history.pop(0)
+	# [0] /dns/v1/projects/project_name/managedZones/{zone.id}
+	# [1] /dns/v1/projects/project_name/managedZones/{zone.id}/rrsets
+        sent = GoogleDNSMockHttp.history.pop()
         self.assertEqual(sent.method, 'GET')
         self.assertEqual(sent.url, f'/dns/v1/projects/project_name/managedZones/{zone.id}/rrsets')
 
-        self.assertEqual(record.id, "A:foo.example.com.")
+        self.assertEqual(record.id, "A:foo")
         self.assertEqual(record.fqdn, "foo.example.com.")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.zone.id, "example-com")
@@ -102,7 +102,7 @@ def test_get_record_zone_does_not_exist(self):
         GoogleDNSMockHttp.type = "ZONE_DOES_NOT_EXIST"
 
         try:
-            self.driver.get_record("example-com", "a:a")
+            self.driver.get_record("example-com", "A:a")
         except ZoneDoesNotExistError as e:
             self.assertEqual(e.zone_id, "example-com")
         else: