Browse Source

python3 compat for azure provider

pull/384/head
Ross McFarland 6 years ago
parent
commit
db77d5b3bb
No known key found for this signature in database GPG Key ID: 61C10C4FC8FE4A89
2 changed files with 10 additions and 6 deletions
  1. +7
    -3
      octodns/provider/azuredns.py
  2. +3
    -3
      requirements.txt

+ 7
- 3
octodns/provider/azuredns.py View File

@ -175,6 +175,10 @@ class _AzureRecord(object):
:type return: bool
'''
def key_dict(d):
return sum([hash('{}:{}'.format(k, v)) for k, v in d.items()])
def parse_dict(params):
vals = []
for char in params:
@ -185,7 +189,7 @@ class _AzureRecord(object):
vals.append(record.__dict__)
except:
vals.append(list_records.__dict__)
vals.sort()
vals.sort(key=key_dict)
return vals
return (self.resource_group == b.resource_group) & \
@ -373,13 +377,13 @@ class AzureProvider(BaseProvider):
self._populate_zones()
self._check_zone(zone_name)
_records = set()
_records = []
records = self._dns_client.record_sets.list_by_dns_zone
if self._check_zone(zone_name):
exists = True
for azrecord in records(self._resource_group, zone_name):
if _parse_azure_type(azrecord.type) in self.SUPPORTS:
_records.add(azrecord)
_records.append(azrecord)
for azrecord in _records:
record_name = azrecord.name if azrecord.name != '@' else ''
typ = _parse_azure_type(azrecord.type)


+ 3
- 3
requirements.txt View File

@ -1,6 +1,6 @@
PyYaml==4.2b1
azure-common==1.1.18
azure-mgmt-dns==2.1.0
azure-common==1.1.23
azure-mgmt-dns==3.0.0
boto3==1.7.5
botocore==1.10.5
dnspython==1.15.0
@ -13,7 +13,7 @@ google-cloud-dns==0.29.0
incf.countryutils==1.0
ipaddress==1.0.22
jmespath==0.9.3
msrestazure==0.6.0
msrestazure==0.6.2
natsort==5.5.0
nsone==0.9.100
ovh==0.4.8


Loading…
Cancel
Save