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

Further test coverage for DynProvider dynamic records

Browse Source
This commit is contained in:
Ross McFarland
2018-12-17 17:16:23 -08:00
parent 942edd66c0
commit d57c7f6c01
3 changed files with 110 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
octodns/provider/dyn.py
+12 -7
View File
@@ -179,6 +179,10 @@ class _CachingDynZone(DynZone):
self.flush_cache()
def _dynamic_value_sort_key(value):
return value['value']
class DynProvider(BaseProvider):
'''
Dynect Managed DNS provider
@@ -497,9 +501,10 @@ class DynProvider(BaseProvider):
# First time we've seen it get its data
# Note we'll have to set fallbacks as we go through rules
# b/c we can't determine them here
values = [value_for(_type, r) for r in record_set.records]
values.sort(key=_dynamic_value_sort_key)
pools[label] = {
'values': [value_for(_type, r)
for r in record_set.records]
'values': values,
}
return default, pools
@@ -863,11 +868,11 @@ class DynProvider(BaseProvider):
def _find_or_create_dynamic_pool(self, td, pools, label, _type, values,
monitor_id=None, record_extras={}):
# TODO: move this somewhere better
def weighted_keyer(d):
return d['value']
values.sort(key=weighted_keyer)
values = sorted(values, key=_dynamic_value_sort_key)
values = map(lambda v: {
'value': v['value'],
'weight': v.get('weight', 1),
}, values)
for pool in pools:
if pool.label != label:
octodns/record/__init__.py
+1
View File
@@ -268,6 +268,7 @@ class _ValuesMixin(object):
values = data['values']
except KeyError:
values = [data['value']]
# TODO: should we natsort values?
self.values = sorted(self._value_type.process(values))
def changes(self, other, target):
tests/test_octodns_provider_dyn.py
+97 -2
View File
@@ -13,7 +13,8 @@ from unittest import TestCase
from octodns.record import Create, Delete, Record, Update
from octodns.provider.base import Plan
from octodns.provider.dyn import DynProvider, _CachingDynZone, DSFMonitor
from octodns.provider.dyn import DynProvider, _CachingDynZone, DSFMonitor, \
_dynamic_value_sort_key
from octodns.zone import Zone
from helpers import SimpleProvider
@@ -1278,7 +1279,7 @@ class TestDynProviderGeo(TestCase):
self.assertEquals('NA-US-CA', miss.label)
mock.assert_called_once_with(td)
# cache miss, non-matching label
# cache miss, matching label, mis-matching values
mock.reset_mock()
values = ['2.2.3.4.', '2.2.3.5']
miss = provider._find_or_create_geo_pool(td, pools, 'default', 'A',
@@ -2032,3 +2033,97 @@ class TestDynProviderDynamic(TestCase):
self.assertEquals(1, record.weight)
self.assertEquals('manual', record._automation)
self.assertTrue(record.eligible)
def test_dynamic_value_sort_key(self):
values = [{
'value': '1.2.3.1',
}, {
'value': '1.2.3.27',
}, {
'value': '1.2.3.127',
}, {
'value': '1.2.3.2',
}]
self.assertEquals([{
'value': '1.2.3.1',
}, {
'value': '1.2.3.127',
}, {
'value': '1.2.3.2',
}, {
'value': '1.2.3.27',
}], sorted(values, key=_dynamic_value_sort_key))
@patch('dyn.tm.services.DSFResponsePool.create')
def test_find_or_create_dynamic_pools(self, mock):
provider = DynProvider('test', 'cust', 'user', 'pass')
td = 42
label = 'foo'
values = [{
'value': '1.2.3.1',
}, {
'value': '1.2.3.127',
}, {
'value': '1.2.3.2',
}, {
'value': '1.2.3.27',
}]
# A Pool with no existing pools, will create
pools = []
pool = provider._find_or_create_dynamic_pool(td, pools, label, 'A',
values)
self.assertIsInstance(pool, DSFResponsePool)
self.assertEquals(1, len(pool.rs_chains))
self.assertEquals(1, len(pool.rs_chains[0].record_sets))
records = pool.rs_chains[0].record_sets[0].records
self.assertEquals(4, len(records))
self.assertEquals([v['value'] for v in values],
[r.address for r in records])
self.assertEquals([1 for r in records], [r.weight for r in records])
mock.assert_called_once_with(td)
# Ask for the pool we created above and include it in the canidate list
mock.reset_mock()
pools = [pool]
cached = provider._find_or_create_dynamic_pool(td, pools, label, 'A',
values)
self.assertEquals(pool, cached)
mock.assert_not_called()
# Invalid candidate pool, still finds the valid one that's there too
mock.reset_mock()
invalid = DSFResponsePool(label, rs_chains=[])
pools = [invalid, pool]
cached = provider._find_or_create_dynamic_pool(td, pools, label, 'A',
values)
self.assertEquals(pool, cached)
mock.assert_not_called()
# Ask for a pool with a different label, should create a new one
mock.reset_mock()
pools = [pool]
other = provider._find_or_create_dynamic_pool(td, pools, 'other', 'A',
values)
self.assertEquals('other', other.label)
mock.assert_called_once_with(td)
# Ask for a pool that matches label-wise, but has different values
values = [{
'value': '1.2.3.44',
}]
mock.reset_mock()
pools = [pool]
new = provider._find_or_create_dynamic_pool(td, pools, label, 'A',
values)
self.assertEquals(label, new.label)
self.assertEquals(1, len(new.rs_chains))
self.assertEquals(1, len(new.rs_chains[0].record_sets))
records = new.rs_chains[0].record_sets[0].records
self.assertEquals(1, len(records))
self.assertEquals([v['value'] for v in values],
[r.address for r in records])
self.assertEquals([1 for r in records], [r.weight for r in records])
mock.assert_called_once_with(td)