Merge branch 'Aquifoliales-supportrecord'

2 files changed, 11 insertions, 3 deletions

diff --git a/octodns-custom-providers/provider/zonefile.py b/octodns-custom-providers/provider/zonefile.py
index dd36c65..6462376 100644
--- a/octodns-custom-providers/provider/zonefile.py
+++ b/octodns-custom-providers/provider/zonefile.py
@@ -25,6 +25,7 @@ def _create_rdata( rdclass, rdtype, data ):
         data['value'] = bytes(data['value'], 'utf-8')
 
     if rdtype == 44: # SSHFP-Record
+        data['algorithm'] = data.pop('algorithm')
         data['fp_type'] = data.pop('fingerprint_type')
         data['fingerprint'] = bytes.fromhex(data['fingerprint'])
 
@@ -33,6 +34,13 @@ def _create_rdata( rdclass, rdtype, data ):
         data['mtype'] = data.pop('matching_type')
         data['cert'] = bytes.fromhex(data.pop('certificate_association_data'))
 
+    if rdtype == 35: # NAPTR-Record
+        data['order'] = data.pop('order')
+        data['preference'] = data.pop('preference')
+        data['flags'] = data.pop('flags')
+        data['regexp'] = data.pop('regexp')
+        data['replacement'] = data.pop('replacement')
+
     for slot in cls.__slots__:
         if not slot in data:
             raise RdataParameterException('{} is missing'.format(slot))
@@ -42,8 +50,8 @@ def _create_rdata( rdclass, rdtype, data ):
 class ZoneFileProvider(BaseProvider):
     SUPPORTS_MULTIVALUE_PTR = True
     SUPPORTS_GEO = False
-    SUPPORTS = set(('A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NS', 'PTR', 'SPF',
-                    'SRV', 'SSHFP', 'TLSA', 'TXT'))
+    SUPPORTS = set(('A', 'AAAA', 'CAA', 'CNAME', 'MX', 'NAPTR', 'NS', 'PTR',
+                    'SPF', 'SRV', 'SSHFP', 'TLSA', 'TXT'))
 
     '''
     SOA dict
diff --git a/setup.py b/setup.py
index 6dbd395..e34533b 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ import setuptools
 
 setup(
     name='octodns-custom-providers',
-    version='0.6.0',
+    version='0.6.1',
     author="Jonas Gunz",
     author_mail="himself@jonasgunz.de",
     description="Custom sources for OctoDNS",