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

Merge branch 'master' of ssh://github.com/github/octodns

Browse Source
This commit is contained in:
Steve Coursen
2018-02-13 10:10:32 -05:00
parent 2e17176442 5138d06162
commit c20296ef90
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
octodns/provider/ovh.py
View File

@@ -259,10 +259,11 @@ class OvhProvider(BaseProvider):
def _params_for_SRV(record):
for value in record.values:
yield {
'subDomain': '{} {} {} {}'.format(value.priority,
value.weight, value.port,
value.target),
'target': record.name,
'target': '{} {} {} {}'.format(value.priority,
value.weight,
value.port,
value.target),
'subDomain': record.name,
'ttl': record.ttl,
'fieldType': record._type
}
@@ -271,10 +272,10 @@ class OvhProvider(BaseProvider):
def _params_for_SSHFP(record):
for value in record.values:
yield {
'subDomain': '{} {} {}'.format(value.algorithm,
value.fingerprint_type,
value.fingerprint),
'target': record.name,
'target': '{} {} {}'.format(value.algorithm,
value.fingerprint_type,
value.fingerprint),
'subDomain': record.name,
'ttl': record.ttl,
'fieldType': record._type
}

4
octodns/record.py
View File

@@ -678,8 +678,8 @@ class PtrRecord(_ValueMixin, Record):
class SshfpValue(object):
VALID_ALGORITHMS = (1, 2)
VALID_FINGERPRINT_TYPES = (1,)
VALID_ALGORITHMS = (1, 2, 3)
VALID_FINGERPRINT_TYPES = (1, 2)
@classmethod
def _validate_value(cls, value):

12
tests/test_octodns_provider_ovh.py
View File

@@ -378,11 +378,11 @@ class TestOvhProvider(TestCase):
call(u'/domain/zone/unit.tests/record', fieldType=u'A',
subDomain=u'', target=u'1.2.3.4', ttl=100),
call(u'/domain/zone/unit.tests/record', fieldType=u'SRV',
subDomain=u'10 20 30 foo-1.unit.tests.',
target='_srv._tcp', ttl=800),
subDomain='_srv._tcp',
target=u'10 20 30 foo-1.unit.tests.', ttl=800),
call(u'/domain/zone/unit.tests/record', fieldType=u'SRV',
subDomain=u'40 50 60 foo-2.unit.tests.',
target='_srv._tcp', ttl=800),
subDomain='_srv._tcp',
target=u'40 50 60 foo-2.unit.tests.', ttl=800),
call(u'/domain/zone/unit.tests/record', fieldType=u'PTR',
subDomain='4', target=u'unit.tests.', ttl=900),
call(u'/domain/zone/unit.tests/record', fieldType=u'NS',
@@ -390,8 +390,8 @@ class TestOvhProvider(TestCase):
call(u'/domain/zone/unit.tests/record', fieldType=u'NS',
subDomain='www3', target=u'ns4.unit.tests.', ttl=700),
call(u'/domain/zone/unit.tests/record',
fieldType=u'SSHFP', target=u'', ttl=1100,
subDomain=u'1 1 bf6b6825d2977c511a475bbefb88a'
fieldType=u'SSHFP', subDomain=u'', ttl=1100,
target=u'1 1 bf6b6825d2977c511a475bbefb88a'
u'ad54'
u'a92ac73',
),

6
tests/test_octodns_record.py
View File

@@ -1360,7 +1360,7 @@ class TestRecordValidation(TestCase):
'ttl': 600,
'value': {
'algorithm': 'nope',
'fingerprint_type': 1,
'fingerprint_type': 2,
'fingerprint': 'bf6b6825d2977c511a475bbefb88aad54a92ac73'
}
})
@@ -1386,7 +1386,7 @@ class TestRecordValidation(TestCase):
'type': 'SSHFP',
'ttl': 600,
'value': {
'algorithm': 1,
'algorithm': 2,
'fingerprint': 'bf6b6825d2977c511a475bbefb88aad54a92ac73'
}
})
@@ -1398,7 +1398,7 @@ class TestRecordValidation(TestCase):
'type': 'SSHFP',
'ttl': 600,
'value': {
'algorithm': 1,
'algorithm': 3,
'fingerprint_type': 'yeeah',
'fingerprint': 'bf6b6825d2977c511a475bbefb88aad54a92ac73'
}