mirror of
https://github.com/github/octodns.git
synced 2024-05-11 05:55:00 +00:00
Merge branch 'master' into smallcubed-easydns-patch
This commit is contained in:
@@ -204,7 +204,7 @@ The above command pulled the existing data out of Route53 and placed the results
|
|||||||
| [Rackspace](/octodns/provider/rackspace.py) | | A, AAAA, ALIAS, CNAME, MX, NS, PTR, SPF, TXT | No | |
|
| [Rackspace](/octodns/provider/rackspace.py) | | A, AAAA, ALIAS, CNAME, MX, NS, PTR, SPF, TXT | No | |
|
||||||
| [Route53](/octodns/provider/route53.py) | boto3 | A, AAAA, CAA, CNAME, MX, NAPTR, NS, PTR, SPF, SRV, TXT | Both | CNAME health checks don't support a Host header |
|
| [Route53](/octodns/provider/route53.py) | boto3 | A, AAAA, CAA, CNAME, MX, NAPTR, NS, PTR, SPF, SRV, TXT | Both | CNAME health checks don't support a Host header |
|
||||||
| [Selectel](/octodns/provider/selectel.py) | | A, AAAA, CNAME, MX, NS, SPF, SRV, TXT | No | |
|
| [Selectel](/octodns/provider/selectel.py) | | A, AAAA, CNAME, MX, NS, SPF, SRV, TXT | No | |
|
||||||
| [Transip](/octodns/provider/transip.py) | transip | A, AAAA, CNAME, MX, SRV, SPF, TXT, SSHFP, CAA | No | |
|
| [Transip](/octodns/provider/transip.py) | transip | A, AAAA, CNAME, MX, NS, SRV, SPF, TXT, SSHFP, CAA | No | |
|
||||||
| [UltraDns](/octodns/provider/ultra.py) | | A, AAAA, CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | No | |
|
| [UltraDns](/octodns/provider/ultra.py) | | A, AAAA, CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | No | |
|
||||||
| [AxfrSource](/octodns/source/axfr.py) | | A, AAAA, CAA, CNAME, LOC, MX, NS, PTR, SPF, SRV, TXT | No | read-only |
|
| [AxfrSource](/octodns/source/axfr.py) | | A, AAAA, CAA, CNAME, LOC, MX, NS, PTR, SPF, SRV, TXT | No | read-only |
|
||||||
| [ZoneFileSource](/octodns/source/axfr.py) | | A, AAAA, CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | No | read-only |
|
| [ZoneFileSource](/octodns/source/axfr.py) | | A, AAAA, CAA, CNAME, MX, NS, PTR, SPF, SRV, TXT | No | read-only |
|
||||||
|
@@ -49,8 +49,8 @@ class TransipProvider(BaseProvider):
|
|||||||
'''
|
'''
|
||||||
SUPPORTS_GEO = False
|
SUPPORTS_GEO = False
|
||||||
SUPPORTS_DYNAMIC = False
|
SUPPORTS_DYNAMIC = False
|
||||||
SUPPORTS = set(
|
SUPPORTS = set(('A', 'AAAA', 'CNAME', 'MX', 'NS', 'SRV', 'SPF', 'TXT',
|
||||||
('A', 'AAAA', 'CNAME', 'MX', 'SRV', 'SPF', 'TXT', 'SSHFP', 'CAA'))
|
'SSHFP', 'CAA'))
|
||||||
# unsupported by OctoDNS: 'TLSA'
|
# unsupported by OctoDNS: 'TLSA'
|
||||||
MIN_TTL = 120
|
MIN_TTL = 120
|
||||||
TIMEOUT = 15
|
TIMEOUT = 15
|
||||||
|
@@ -56,10 +56,11 @@ class MockDomainService(DomainService):
|
|||||||
|
|
||||||
_dns_entries.extend(entries_for(name, record))
|
_dns_entries.extend(entries_for(name, record))
|
||||||
|
|
||||||
# NS is not supported as a DNS Entry,
|
# Add a non-supported type
|
||||||
# so it should cover the if statement
|
# so it triggers the "is supported" (transip.py:115) check and
|
||||||
|
# give 100% code coverage
|
||||||
_dns_entries.append(
|
_dns_entries.append(
|
||||||
DnsEntry('@', '3600', 'NS', 'ns01.transip.nl.'))
|
DnsEntry('@', '3600', 'BOGUS', 'ns01.transip.nl.'))
|
||||||
|
|
||||||
self.mockupEntries = _dns_entries
|
self.mockupEntries = _dns_entries
|
||||||
|
|
||||||
@@ -222,7 +223,7 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd
|
|||||||
provider._client = MockDomainService('unittest', self.bogus_key)
|
provider._client = MockDomainService('unittest', self.bogus_key)
|
||||||
plan = provider.plan(_expected)
|
plan = provider.plan(_expected)
|
||||||
|
|
||||||
self.assertEqual(14, plan.change_counts['Create'])
|
self.assertEqual(15, plan.change_counts['Create'])
|
||||||
self.assertEqual(0, plan.change_counts['Update'])
|
self.assertEqual(0, plan.change_counts['Update'])
|
||||||
self.assertEqual(0, plan.change_counts['Delete'])
|
self.assertEqual(0, plan.change_counts['Delete'])
|
||||||
|
|
||||||
@@ -235,7 +236,7 @@ N4OiVz1I3rbZGYa396lpxO6ku8yCglisL1yrSP6DdEUp66ntpKVd
|
|||||||
provider = TransipProvider('test', 'unittest', self.bogus_key)
|
provider = TransipProvider('test', 'unittest', self.bogus_key)
|
||||||
provider._client = MockDomainService('unittest', self.bogus_key)
|
provider._client = MockDomainService('unittest', self.bogus_key)
|
||||||
plan = provider.plan(_expected)
|
plan = provider.plan(_expected)
|
||||||
self.assertEqual(14, len(plan.changes))
|
self.assertEqual(15, len(plan.changes))
|
||||||
changes = provider.apply(plan)
|
changes = provider.apply(plan)
|
||||||
self.assertEqual(changes, len(plan.changes))
|
self.assertEqual(changes, len(plan.changes))
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user