1
0
mirror of https://github.com/github/octodns.git synced 2024-05-11 05:55:00 +00:00

Merge branch 'master' into pyyaml-4.2b1

This commit is contained in:
Ross McFarland
2019-01-08 09:42:13 -08:00
committed by GitHub
2 changed files with 65 additions and 46 deletions

View File

@@ -1,6 +1,6 @@
PyYaml==4.2b1 PyYaml==4.2b1
azure-common==1.1.9 azure-common==1.1.9
azure-mgmt-dns==1.0.1 azure-mgmt-dns==1.2.0
boto3==1.7.5 boto3==1.7.5
botocore==1.10.5 botocore==1.10.5
dnspython==1.15.0 dnspython==1.15.0

View File

@@ -258,46 +258,63 @@ class TestAzureDnsProvider(TestCase):
provider = self._get_provider() provider = self._get_provider()
rs = [] rs = []
rs.append(RecordSet(name='a1', ttl=0, type='A', recordSet = RecordSet(arecords=[ARecord('1.1.1.1')])
arecords=[ARecord('1.1.1.1')])) recordSet.name, recordSet.ttl, recordSet.type = 'a1', 0, 'A'
rs.append(RecordSet(name='a2', ttl=1, type='A', rs.append(recordSet)
arecords=[ARecord('1.1.1.1'), recordSet = RecordSet(arecords=[ARecord('1.1.1.1'),
ARecord('2.2.2.2')])) ARecord('2.2.2.2')])
rs.append(RecordSet(name='aaaa1', ttl=2, type='AAAA', recordSet.name, recordSet.ttl, recordSet.type = 'a2', 1, 'A'
aaaa_records=[AaaaRecord('1:1ec:1::1')])) rs.append(recordSet)
rs.append(RecordSet(name='aaaa2', ttl=3, type='AAAA', recordSet = RecordSet(aaaa_records=[AaaaRecord('1:1ec:1::1')])
aaaa_records=[AaaaRecord('1:1ec:1::1'), recordSet.name, recordSet.ttl, recordSet.type = 'aaaa1', 2, 'AAAA'
AaaaRecord('1:1ec:1::2')])) rs.append(recordSet)
rs.append(RecordSet(name='cname1', ttl=4, type='CNAME', recordSet = RecordSet(aaaa_records=[AaaaRecord('1:1ec:1::1'),
cname_record=CnameRecord('cname.unit.test.'))) AaaaRecord('1:1ec:1::2')])
rs.append(RecordSet(name='cname2', ttl=5, type='CNAME', recordSet.name, recordSet.ttl, recordSet.type = 'aaaa2', 3, 'AAAA'
cname_record=None)) rs.append(recordSet)
rs.append(RecordSet(name='mx1', ttl=6, type='MX', recordSet = RecordSet(cname_record=CnameRecord('cname.unit.test.'))
mx_records=[MxRecord(10, 'mx1.unit.test.')])) recordSet.name, recordSet.ttl, recordSet.type = 'cname1', 4, 'CNAME'
rs.append(RecordSet(name='mx2', ttl=7, type='MX', rs.append(recordSet)
mx_records=[MxRecord(10, 'mx1.unit.test.'), recordSet = RecordSet(cname_record=None)
MxRecord(11, 'mx2.unit.test.')])) recordSet.name, recordSet.ttl, recordSet.type = 'cname2', 5, 'CNAME'
rs.append(RecordSet(name='ns1', ttl=8, type='NS', rs.append(recordSet)
ns_records=[NsRecord('ns1.unit.test.')])) recordSet = RecordSet(mx_records=[MxRecord(10, 'mx1.unit.test.')])
rs.append(RecordSet(name='ns2', ttl=9, type='NS', recordSet.name, recordSet.ttl, recordSet.type = 'mx1', 6, 'MX'
ns_records=[NsRecord('ns1.unit.test.'), rs.append(recordSet)
NsRecord('ns2.unit.test.')])) recordSet = RecordSet(mx_records=[MxRecord(10, 'mx1.unit.test.'),
rs.append(RecordSet(name='ptr1', ttl=10, type='PTR', MxRecord(11, 'mx2.unit.test.')])
ptr_records=[PtrRecord('ptr1.unit.test.')])) recordSet.name, recordSet.ttl, recordSet.type = 'mx2', 7, 'MX'
rs.append(RecordSet(name='ptr2', ttl=11, type='PTR', rs.append(recordSet)
ptr_records=[PtrRecord(None)])) recordSet = RecordSet(ns_records=[NsRecord('ns1.unit.test.')])
rs.append(RecordSet(name='_srv1._tcp', ttl=12, type='SRV', recordSet.name, recordSet.ttl, recordSet.type = 'ns1', 8, 'NS'
srv_records=[SrvRecord(1, 2, 3, '1unit.tests.')])) rs.append(recordSet)
rs.append(RecordSet(name='_srv2._tcp', ttl=13, type='SRV', recordSet = RecordSet(ns_records=[NsRecord('ns1.unit.test.'),
srv_records=[SrvRecord(1, 2, 3, '1unit.tests.'), NsRecord('ns2.unit.test.')])
SrvRecord(4, 5, 6, '2unit.tests.')])) recordSet.name, recordSet.ttl, recordSet.type = 'ns2', 9, 'NS'
rs.append(RecordSet(name='txt1', ttl=14, type='TXT', rs.append(recordSet)
txt_records=[TxtRecord('sample text1')])) recordSet = RecordSet(ptr_records=[PtrRecord('ptr1.unit.test.')])
rs.append(RecordSet(name='txt2', ttl=15, type='TXT', recordSet.name, recordSet.ttl, recordSet.type = 'ptr1', 10, 'PTR'
txt_records=[TxtRecord('sample text1'), rs.append(recordSet)
TxtRecord('sample text2')])) recordSet = RecordSet(ptr_records=[PtrRecord(None)])
rs.append(RecordSet(name='', ttl=16, type='SOA', recordSet.name, recordSet.ttl, recordSet.type = 'ptr2', 11, 'PTR'
soa_record=[SoaRecord()])) rs.append(recordSet)
recordSet = RecordSet(srv_records=[SrvRecord(1, 2, 3, '1unit.tests.')])
recordSet.name, recordSet.ttl, recordSet.type = '_srv1._tcp', 12, 'SRV'
rs.append(recordSet)
recordSet = RecordSet(srv_records=[SrvRecord(1, 2, 3, '1unit.tests.'),
SrvRecord(4, 5, 6, '2unit.tests.')])
recordSet.name, recordSet.ttl, recordSet.type = '_srv2._tcp', 13, 'SRV'
rs.append(recordSet)
recordSet = RecordSet(txt_records=[TxtRecord('sample text1')])
recordSet.name, recordSet.ttl, recordSet.type = 'txt1', 14, 'TXT'
rs.append(recordSet)
recordSet = RecordSet(txt_records=[TxtRecord('sample text1'),
TxtRecord('sample text2')])
recordSet.name, recordSet.ttl, recordSet.type = 'txt2', 15, 'TXT'
rs.append(recordSet)
recordSet = RecordSet(soa_record=[SoaRecord()])
recordSet.name, recordSet.ttl, recordSet.type = '', 16, 'SOA'
rs.append(recordSet)
record_list = provider._dns_client.record_sets.list_by_dns_zone record_list = provider._dns_client.record_sets.list_by_dns_zone
record_list.return_value = rs record_list.return_value = rs
@@ -364,11 +381,13 @@ class TestAzureDnsProvider(TestCase):
provider = self._get_provider() provider = self._get_provider()
rs = [] rs = []
rs.append(RecordSet(name='a1', ttl=0, type='A', recordSet = RecordSet(arecords=[ARecord('1.1.1.1')])
arecords=[ARecord('1.1.1.1')])) recordSet.name, recordSet.ttl, recordSet.type = 'a1', 0, 'A'
rs.append(RecordSet(name='a2', ttl=1, type='A', rs.append(recordSet)
arecords=[ARecord('1.1.1.1'), recordSet = RecordSet(arecords=[ARecord('1.1.1.1'),
ARecord('2.2.2.2')])) ARecord('2.2.2.2')])
recordSet.name, recordSet.ttl, recordSet.type = 'a2', 1, 'A'
rs.append(recordSet)
record_list = provider._dns_client.record_sets.list_by_dns_zone record_list = provider._dns_client.record_sets.list_by_dns_zone
record_list.return_value = rs record_list.return_value = rs