Fastdns provider:

- added test cases for testin populate()
- added mock request responses in tests/fixtures/
- updated requirements.txt to require edgegrid-python

requirements.txt

@@ -6,6 +6,7 @@ botocore==1.10.5
 dnspython==1.15.0
 docutils==0.14
 dyn==1.8.1
+edgegrid-python==1.1.1
 futures==3.2.0
 google-cloud-core==0.28.1
 google-cloud-dns==0.29.0

tests/fixtures/fastdns-invalid-content.json

@@ -0,0 +1,35 @@
+{
+    "recordsets": [
+        {
+            "rdata": [
+                "",
+                "12 20 foo-2.unit.tests."
+            ],
+            "type": "SRV",
+            "name": "_srv._tcp.unit.tests",
+            "ttl": 600
+        },
+        {
+            "rdata": [
+                "",
+                "1 1"
+            ],
+            "type": "SSHFP",
+            "name": "unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "",
+                "100 \"U\" \"SIP+D2U\" \"!^.*$!sip:info@bar.example.com!\" ."
+            ],
+            "type": "NAPTR",
+            "name": "naptr.unit.tests",
+            "ttl": 600
+        }
+    ],
+    "metadata": {
+        "totalElements": 3,
+        "showAll": true
+    }
+}

tests/fixtures/fastdns-records.json

@@ -0,0 +1,157 @@
+{
+    "recordsets": [
+        {
+            "rdata": [
+                "10 20 30 foo-1.unit.tests.",
+                "12 20 30 foo-2.unit.tests."
+            ],
+            "type": "SRV",
+            "name": "_srv._tcp.unit.tests",
+            "ttl": 600
+        },
+        {
+            "rdata": [
+                "2601:644:500:e210:62f8:1dff:feb8:947a"
+            ],
+            "type": "AAAA",
+            "name": "aaaa.unit.tests",
+            "ttl": 600
+        },
+        {
+            "rdata": [
+                "ns1.akam.net.",
+                "ns2.akam.net.",
+                "ns3.akam.net.",
+                "ns4.akam.net."
+            ],
+            "type": "NS",
+            "name": "unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "1.2.3.4",
+                "1.2.3.5"
+            ],
+            "type": "A",
+            "name": "unit.tests",
+            "ttl": 300
+        },
+        {
+            "rdata": [
+                "ns1.akam.net hostmaster.akamai.com 1489074932 86400 7200 604800 300"
+            ],
+            "type": "SOA",
+            "name": "unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "1 1 7491973e5f8b39d5327cd4e08bc81b05f7710b49",
+                "1 1 bf6b6825d2977c511a475bbefb88aad54a92ac73"
+            ],
+            "type": "SSHFP",
+            "name": "unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "unit.tests."
+            ],
+            "type": "CNAME",
+            "name": "cname.unit.tests",
+            "ttl": 300
+        },
+        {
+            "rdata": [
+                "unit.tests."
+            ],
+            "type": "CNAME",
+            "name": "excluded.unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "unit.tests."
+            ],
+            "type": "CNAME",
+            "name": "included.unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "10 smtp-4.unit.tests.",
+                "20 smtp-2.unit.tests.",
+                "30 smtp-3.unit.tests.",
+                "40 smtp-1.unit.tests."
+            ],
+            "type": "MX",
+            "name": "mx.unit.tests",
+            "ttl": 300
+        },
+        {
+            "rdata": [
+                "10 100 \"S\" \"SIP+D2U\" \"!^.*$!sip:info@bar.example.com!\" .",
+                "100 100 \"U\" \"SIP+D2U\" \"!^.*$!sip:info@bar.example.com!\" ."
+            ],
+            "type": "NAPTR",
+            "name": "naptr.unit.tests",
+            "ttl": 600
+        },
+        {
+            "rdata": [
+                "foo.bar.com."
+            ],
+            "type": "PTR",
+            "name": "ptr.unit.tests",
+            "ttl": 300
+        },
+        {
+            "rdata": [
+                "\"v=spf1 ip4:192.168.0.1/16-all\""
+            ],
+            "type": "SPF",
+            "name": "spf.unit.tests",
+            "ttl": 600
+        },
+        {
+            "rdata": [
+                "ns1.unit.tests.",
+                "ns2.unit.tests."
+            ],
+            "type": "NS",
+            "name": "under.unit.tests",
+            "ttl": 3600
+        },
+        {
+            "rdata": [
+                "\"Bah bah black sheep\"",
+                "\"have you any wool.\"",
+                "\"v=DKIM1;k=rsa;s=email;h=sha256;p=A/kinda+of/long/string+with+numb3rs\""
+            ],
+            "type": "TXT",
+            "name": "txt.unit.tests",
+            "ttl": 600
+        },
+        {
+            "rdata": [
+                "2.2.3.6"
+            ],
+            "type": "A",
+            "name": "www.unit.tests",
+            "ttl": 300
+        },
+        {
+            "rdata": [
+                "2.2.3.6"
+            ],
+            "type": "A",
+            "name": "www.sub.unit.tests",
+            "ttl": 300
+        }
+    ],
+    "metadata": {
+        "totalElements": 16,
+        "showAll": true
+    }
+}

tests/test_octodns_provider_fastdns.py

@@ -22,19 +22,32 @@ class TestFastdnsProvider(TestCase):
     source = YamlProvider('test', join(dirname(__file__), 'config'))
     source.populate(expected)
 
+    # Our test suite differs a bit, add our NS and remove the simple one
+    expected.add_record(Record.new(expected, 'under', {
+        'ttl': 3600,
+        'type': 'NS',
+        'values': [
+            'ns1.unit.tests.',
+            'ns2.unit.tests.',
+        ]
+    }))
+    for record in list(expected.records):
+        if record.name == 'sub' and record._type == 'NS':
+            expected._remove_record(record)
+            break
+
     def test_populate(self):
-        provider = AkamaiProvider("test", "client_secret", "host", "access_token", 
-                                  "client_token")
-        
+        provider = AkamaiProvider("test", "secret", "akam.com", "atok", "ctok")
+
         # Bad Auth
         with requests_mock() as mock:
-            mock.get(ANY, status_code=401,
-                     text='{"message": "Authentication failed"}')
+            mock.get(ANY, status_code=401, text='{"message": "Unauthorized"}')
 
             with self.assertRaises(Exception) as ctx:
                 zone = Zone('unit.tests.', [])
                 provider.populate(zone)
-            self.assertEquals("401: Unauthorized", ctx.exception.message)
+
+            self.assertEquals(401, ctx.exception.response.status_code)
 
         # general error
         with requests_mock() as mock:
@@ -45,7 +58,7 @@ class TestFastdnsProvider(TestCase):
                 provider.populate(zone)
             self.assertEquals(502, ctx.exception.response.status_code)
 
-         # Non-existant zone doesn't populate anything
+        # Non-existant zone doesn't populate anything
         with requests_mock() as mock:
             mock.get(ANY, status_code=404,
                      text='{"message": "Domain `foo.bar` not found"}')
@@ -54,17 +67,22 @@ class TestFastdnsProvider(TestCase):
             provider.populate(zone)
             self.assertEquals(set(), zone.records)
 
-        # # No diffs == no changes
-        # with requests_mock() as mock:
-        #     base = 'https://api.dnsimple.com/v2/42/zones/unit.tests/' \
-        #         'records?page='
-        #     with open('tests/fixtures/dnsimple-page-1.json') as fh:
-        #         mock.get('{}{}'.format(base, 1), text=fh.read())
-        #     with open('tests/fixtures/dnsimple-page-2.json') as fh:
-        #         mock.get('{}{}'.format(base, 2), text=fh.read())
-
-        #     zone = Zone('unit.tests.', [])
-        #     provider.populate(zone)
-        #     self.assertEquals(16, len(zone.records))
-        #     changes = self.expected.changes(zone, provider)
-        #     self.assertEquals(0, len(changes))
+        # No diffs == no changes
+        with requests_mock() as mock:
+
+            with open('tests/fixtures/fastdns-records.json') as fh:
+                mock.get(ANY, text=fh.read())
+
+            zone = Zone('unit.tests.', [])
+            provider.populate(zone)
+            self.assertEquals(16, len(zone.records))
+            changes = self.expected.changes(zone, provider)
+            self.assertEquals(0, len(changes))
+
+        # 2nd populate makes no network calls/all from cache
+        again = Zone('unit.tests.', [])
+        provider.populate(again)
+        self.assertEquals(16, len(again.records))
+
+        # bust the cache
+        del provider._zone_records[zone.name]