zonomi: Switch to default local ID format

Previously, the Zonomi DNS driver could only return the first record
for a given host, because it used the name of the host as Record.id.

Now, use the new default, <type>[:<name>], format to allow various
records to be differentiated for a given host.

Author: Aaron Sierra

libcloud/dns/drivers/zonomi.py

@@ -118,9 +118,10 @@ def get_record(self, zone_id, record_id):
         record = None
         zone = self.get_zone(zone_id=zone_id)
         records = self.list_records(zone=zone)
+        parts = self.from_default_id(zone, record_id)
 
         for r in records:
-            if r.id == record_id:
+            if r.name == parts.name and r.type == parts.type:
                 record = r
 
         if record is None:
@@ -320,11 +321,12 @@ def _to_record(self, item, zone):
             record_name = full_domain[:index]
         else:
             record_name = zone.domain
+        rtype = item["type"]
         record = Record(
-            id=record_name,
+            id=self.to_default_id(zone, item["name"], rtype),
             name=record_name,
             data=item["content"],
-            type=item["type"],
+            type=rtype,
             zone=zone,
             driver=self,
             ttl=ttl,

libcloud/test/dns/test_zonomi.py

@@ -45,7 +45,7 @@ def setUp(self):
             extra={},
         )
         self.test_record = Record(
-            id="record.zone.com",
+            id="A:record",
             name="record.zone.com",
             data="127.0.0.1",
             type="A",
@@ -184,28 +184,28 @@ def test_list_records_success(self):
         self.assertEqual(len(records), 4)
 
         record = records[0]
-        self.assertEqual(record.id, "zone.com")
+        self.assertEqual(record.id, "SOA")
         self.assertEqual(record.type, "SOA")
         self.assertEqual(record.data, "ns1.zonomi.com. soacontact.zonomi.com. 13")
         self.assertEqual(record.name, "zone.com")
         self.assertEqual(record.zone, self.test_zone)
 
         second_record = records[1]
-        self.assertEqual(second_record.id, "zone.com")
+        self.assertEqual(second_record.id, "NS")
         self.assertEqual(second_record.name, "zone.com")
         self.assertEqual(second_record.type, "NS")
         self.assertEqual(second_record.data, "ns1.zonomi.com")
         self.assertEqual(second_record.zone, self.test_zone)
 
         third_record = records[2]
-        self.assertEqual(third_record.id, "oltjano")
+        self.assertEqual(third_record.id, "A:oltjano")
         self.assertEqual(third_record.name, "oltjano")
         self.assertEqual(third_record.type, "A")
         self.assertEqual(third_record.data, "127.0.0.1")
         self.assertEqual(third_record.zone, self.test_zone)
 
         fourth_record = records[3]
-        self.assertEqual(fourth_record.id, "zone.com")
+        self.assertEqual(fourth_record.id, "NS")
         self.assertEqual(fourth_record.name, "zone.com")
         self.assertEqual(fourth_record.type, "NS")
         self.assertEqual(fourth_record.data, "ns5.zonomi.com")
@@ -239,15 +239,15 @@ def test_get_record_success(self):
             driver=self.driver,
         )
         self.driver.get_zone = MagicMock(return_value=zone)
-        record = self.driver.get_record(record_id="oltjano", zone_id="zone.com")
+        record = self.driver.get_record(record_id="A:oltjano", zone_id="zone.com")
 
         sent = ZonomiMockHttp.history.pop()
         self.assertEqual(sent.method, "GET")
         self.assertEqual(sent.url, "/app/dns/dyndns.jsp")
         self.assertIn("QUERY", sent.query["action"])
         self.assertIn("**.zone.com", sent.query["name"])
 
-        self.assertEqual(record.id, "oltjano")
+        self.assertEqual(record.id, "A:oltjano")
         self.assertEqual(record.name, "oltjano")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.data, "127.0.0.1")
@@ -303,7 +303,7 @@ def test_create_record_success(self):
         self.assertIn("A", sent.query["type"])
         self.assertIn("127.0.0.1", sent.query["value"])
 
-        self.assertEqual(record.id, "createrecord")
+        self.assertEqual(record.id, "A:createrecord")
         self.assertEqual(record.name, "createrecord")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.data, "127.0.0.1")