dns: liquidweb: Add API request checking

Author: Aaron Sierra

libcloud/test/dns/test_liquidweb.py

@@ -30,9 +30,18 @@
 from libcloud.dns.drivers.liquidweb import LiquidWebDNSDriver
 
 
+def value_hedge(val):
+    """
+    Return a tuple containing the original value and its string representation,
+    for use with assertIn() when the value format is inconsistent.
+    """
+    return (val, str(val))
+
+
 class LiquidWebTests(unittest.TestCase):
     def setUp(self):
         LiquidWebMockHttp.type = None
+        LiquidWebMockHttp.history.clear()
         LiquidWebDNSDriver.connectionCls.conn_class = LiquidWebMockHttp
         self.driver = LiquidWebDNSDriver(*DNS_PARAMS_LIQUIDWEB)
         self.test_zone = Zone(
@@ -66,6 +75,10 @@ def test_list_zones_empty(self):
     def test_list_zones_success(self):
         zones = self.driver.list_zones()
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Zone/list")
+
         self.assertEqual(len(zones), 3)
 
         zone = zones[0]
@@ -102,6 +115,11 @@ def test_get_zone_success(self):
         LiquidWebMockHttp.type = "GET_ZONE_SUCCESS"
         zone = self.driver.get_zone(zone_id="13")
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Zone/details")
+        self.assertIn(sent.json["params"]["id"], value_hedge(13))
+
         self.assertEqual(zone.id, "13")
         self.assertEqual(zone.domain, "blogtest.com")
         self.assertEqual(zone.type, "NATIVE")
@@ -113,6 +131,11 @@ def test_delete_zone_success(self):
         zone = self.test_zone
         status = self.driver.delete_zone(zone=zone)
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Zone/delete")
+        self.assertIn(sent.json["params"]["id"], value_hedge(zone.id))
+
         self.assertEqual(status, True)
 
     def test_delete_zone_zone_does_not_exist(self):
@@ -129,6 +152,11 @@ def test_create_zone_success(self):
         LiquidWebMockHttp.type = "CREATE_ZONE_SUCCESS"
         zone = self.driver.create_zone(domain="test.com")
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Zone/create")
+        self.assertEqual(sent.json["params"]["name"], "test.com")
+
         self.assertEqual(zone.id, "13")
         self.assertEqual(zone.domain, "test.com")
         self.assertEqual(zone.type, "NATIVE")
@@ -156,6 +184,11 @@ def test_list_records_success(self):
         zone = self.test_zone
         records = self.driver.list_records(zone=zone)
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Record/list")
+        self.assertIn(sent.json["params"]["zone_id"], value_hedge(zone.id))
+
         self.assertEqual(len(records), 3)
 
         record = records[0]
@@ -193,6 +226,11 @@ def test_get_record_success(self):
         LiquidWebMockHttp.type = "GET_RECORD_SUCCESS"
         record = self.driver.get_record(zone_id="13", record_id="13")
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Record/details")
+        self.assertIn(sent.json["params"]["id"], value_hedge(13))
+
         self.assertEqual(record.id, "13")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.name, "nerd.domain.com")
@@ -214,6 +252,15 @@ def test_update_record_success(self):
             data=record.data,
             extra={"ttl": 5600},
         )
+
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "PUT")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Record/update")
+        self.assertIn(sent.json["params"]["id"], value_hedge(13))
+        self.assertEqual(sent.json["params"]["name"], "nerd.domain.com")
+        self.assertEqual(sent.json["params"]["rdata"], "127.0.0.1")
+        self.assertIn(sent.json["params"]["ttl"], value_hedge(5600))
+
         self.assertEqual(record1.id, "13")
         self.assertEqual(record1.type, "A")
         self.assertEqual(record1.name, "nerd.domain.com")
@@ -255,6 +302,14 @@ def test_create_record_success(self):
             extra={"ttl": 300},
         )
 
+        sent = LiquidWebMockHttp.history.pop()
+        self.assertEqual(sent.method, "POST")
+        self.assertEqual(sent.url, "/v1/Network/DNS/Record/create")
+        self.assertIn(sent.json["params"]["zone_id"], value_hedge(13))
+        self.assertEqual(sent.json["params"]["name"], "nerd.domain.com")
+        self.assertEqual(sent.json["params"]["rdata"], "127.0.0.1")
+        self.assertIn(sent.json["params"]["ttl"], value_hedge(300))
+
         self.assertEqual(record.id, "13")
         self.assertEqual(record.type, "A")
         self.assertEqual(record.name, "nerd.domain.com")
@@ -267,6 +322,7 @@ def test_record_already_exists_error(self):
 
 class LiquidWebMockHttp(MockHttp):
     fixtures = DNSFileFixtures("liquidweb")
+    keep_history = True
 
     def _v1_Network_DNS_Zone_list(self, method, url, body, headers):
         body = self.fixtures.load("zones_list.json")