dns: pointdns: Add API request checking

* Align record update with parent zone in test_update_record_success()

Author: Aaron Sierra

libcloud/test/dns/fixtures/pointdns/_zones_1_records_141_UPDATE.json

@@ -1,6 +1,6 @@
 {
     "zone_record": {
-        "name": "updated.com",
+        "name": "updated.example.com",
         "data": "1.2.3.5",
         "id": 141,
         "aux": null,

libcloud/test/dns/test_pointdns.py

@@ -27,6 +27,7 @@ class PointDNSTests(unittest.TestCase):
     def setUp(self):
         PointDNSDriver.connectionCls.conn_class = PointDNSMockHttp
         PointDNSMockHttp.type = None
+        PointDNSMockHttp.history.clear()
         self.driver = PointDNSDriver(*DNS_PARAMS_POINTDNS)
 
     def assertHasKeys(self, dictionary, keys):
@@ -50,6 +51,11 @@ def test_list_record_types(self):
     def test_list_zones_success(self):
         PointDNSMockHttp.type = "GET"
         zones = self.driver.list_zones()
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "GET")
+        self.assertEqual(sent.url, "/zones")
+
         self.assertEqual(len(zones), 2)
 
         zone1 = zones[0]
@@ -70,6 +76,11 @@ def test_list_records_success(self):
         PointDNSMockHttp.type = "GET"
         zone = self.driver.list_zones()[0]
         records = self.driver.list_records(zone=zone)
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "GET")
+        self.assertEqual(sent.url, "/zones/1/records")
+
         self.assertEqual(len(records), 2)
 
         record1 = records[0]
@@ -89,6 +100,11 @@ def test_list_records_success(self):
     def test_get_zone_success(self):
         PointDNSMockHttp.type = "GET"
         zone1 = self.driver.get_zone(zone_id="1")
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "GET")
+        self.assertEqual(sent.url, "/zones/1")
+
         self.assertEqual(zone1.id, "1")
         self.assertEqual(zone1.type, "master")
         self.assertEqual(zone1.domain, "example.com")
@@ -107,6 +123,13 @@ def test_get_zone_zone_not_exists(self):
     def test_get_record_success(self):
         PointDNSMockHttp.type = "GET"
         record = self.driver.get_record(zone_id="1", record_id="141")
+
+        # [0] GET /zones/1/records/141
+        # [1] GET /zones/1
+        sent = PointDNSMockHttp.history.pop(0)
+        self.assertEqual(sent.method, "GET")
+        self.assertEqual(sent.url, "/zones/1/records/141")
+
         self.assertEqual(record.id, "141")
         self.assertEqual(record.name, "site.example.com")
         self.assertEqual(record.type, RecordType.A)
@@ -125,6 +148,12 @@ def test_get_record_record_not_exists(self):
     def test_create_zone_success(self):
         PointDNSMockHttp.type = "CREATE"
         zone = self.driver.create_zone(domain="example.com")
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/zones")
+        self.assertEqual(sent.json["zone"]["name"], "example.com")
+
         self.assertEqual(zone.id, "2")
         self.assertEqual(zone.domain, "example.com")
         self.assertEqual(zone.ttl, 3600)
@@ -147,6 +176,14 @@ def test_create_record_success(self):
         record = self.driver.create_record(
             name="site.example.com", zone=zone, type=RecordType.A, data="1.2.3.4"
         )
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/zones/1/records")
+        self.assertEqual(sent.json["zone_record"]["name"], "site.example.com")
+        self.assertEqual(sent.json["zone_record"]["record_type"], "A")
+        self.assertEqual(sent.json["zone_record"]["data"], "1.2.3.4")
+
         self.assertEqual(record.id, "143")
         self.assertEqual(record.name, "site.example.com")
         self.assertEqual(record.type, RecordType.A)
@@ -172,6 +209,13 @@ def test_update_zone_success(self):
         PointDNSMockHttp.type = "ZONE_UPDATE"
         extra = {"user-id": 6}
         _zone = self.driver.update_zone(zone, zone.domain, zone.ttl, extra=extra)
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "PUT")
+        self.assertEqual(sent.url, "/zones/1")
+        self.assertEqual(sent.json["zone"]["name"], "example.com")
+        self.assertEqual(sent.json["zone"]["user-id"], 6)
+
         self.assertEqual(_zone.extra.get("user-id"), 6)
 
     def test_update_zone_with_error(self):
@@ -193,13 +237,24 @@ def test_update_record_success(self):
         extra = {"ttl": 4500}
         record1 = self.driver.update_record(
             record=record,
-            name="updated.com",
+            name="updated.example.com",
             type=RecordType.A,
             data="1.2.3.5",
             extra=extra,
         )
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "PUT")
+        self.assertEqual(sent.url, "/zones/1/records/141")
+        self.assertEqual(sent.json["zone_record"]["name"], "updated.example.com")
+        self.assertEqual(sent.json["zone_record"]["record_type"], "A")
+        self.assertEqual(sent.json["zone_record"]["data"], "1.2.3.5")
+        self.assertEqual(sent.json["zone_record"]["ttl"], 4500)
+
+        self.assertEqual(record.name, "site.example.com")
         self.assertEqual(record.data, "1.2.3.4")
         self.assertEqual(record.extra.get("ttl"), 3600)
+        self.assertEqual(record1.name, "updated.example.com")
         self.assertEqual(record1.data, "1.2.3.5")
         self.assertEqual(record1.extra.get("ttl"), 4500)
 
@@ -226,6 +281,11 @@ def test_delete_zone_success(self):
         zone = self.driver.list_zones()[0]
         PointDNSMockHttp.type = "DELETE"
         status = self.driver.delete_zone(zone=zone)
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "DELETE")
+        self.assertEqual(sent.url, "/zones/1")
+
         self.assertTrue(status)
 
     def test_delete_zone_zone_not_exists(self):
@@ -247,6 +307,11 @@ def test_delete_record_success(self):
         record = records[1]
         PointDNSMockHttp.type = "DELETE"
         status = self.driver.delete_record(record=record)
+
+        sent = PointDNSMockHttp.history.pop()
+        self.assertEqual(sent.method, "DELETE")
+        self.assertEqual(sent.url, "/zones/1/records/150")
+
         self.assertTrue(status)
 
     def test_delete_record_record_not_exists(self):
@@ -556,6 +621,7 @@ def test_ex_delete_mail_redirect_not_found(self):
 
 class PointDNSMockHttp(MockHttp):
     fixtures = DNSFileFixtures("pointdns")
+    keep_history = True
 
     def _zones_GET(self, method, url, body, headers):
         body = self.fixtures.load("_zones_GET.json")