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

Process rules and pools in respective functions

Browse Source
This commit is contained in:
Viranch Mehta
2021-10-18 23:15:46 -07:00
parent 4610d17747
commit 9c2a6aecc0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
octodns/provider/ns1.py
View File

@@ -598,6 +598,9 @@ class Ns1Provider(BaseProvider):
if fallback is not None:
pool['fallback'] = fallback
# Order and convert to a list
default = sorted(default)
return default, pools
def _parse_rule_geos(self, meta):
@@ -688,6 +691,9 @@ class Ns1Provider(BaseProvider):
# pool and recorded the sorted unique set of them
rule['geos'] = sorted(set(rule.get('geos', [])) | geos)
# Convert to list and order
rules = sorted(rules.values(), key=lambda r: (r['_order'], r['pool']))
return rules
def _data_for_dynamic(self, _type, record):
@@ -700,12 +706,6 @@ class Ns1Provider(BaseProvider):
default, pools = self._parse_pools(record['answers'])
rules = self._parse_rules(pools, record['regions'])
# Order and convert to a list
default = sorted(default)
# Convert to list and order
rules = list(rules.values())
rules.sort(key=lambda r: (r['_order'], r['pool']))
data = {
'dynamic': {
'pools': pools,