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

Address review comments. Introduce catchall poolname

Browse Source
This commit is contained in:
Pavan Chandrashekar
2020-04-10 11:06:19 -07:00
parent a64ec99de8
commit 4c21cfd85b
2 changed files with 92 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/test_octodns_provider_ns1.py
View File

@@ -528,7 +528,7 @@ class TestNs1Provider(TestCase):
class TestNs1ProviderDynamic(TestCase):
zone = Zone('unit.tests.', [])
record = Record.new(zone, '', {
record_data = {
'dynamic': {
'pools': {
'lhr': {
@@ -573,7 +573,8 @@ class TestNs1ProviderDynamic(TestCase):
'type': 'A',
'value': '1.2.3.4',
'meta': {},
})
}
record = Record.new(zone, '', record_data)
def test_notes(self):
provider = Ns1Provider('test', 'api-key')
@@ -978,6 +979,34 @@ class TestNs1ProviderDynamic(TestCase):
rule0['geos'] = rule0_saved_geos
rule1['geos'] = rule1_saved_geos
# Test record with no reuse of the catchall
monitors_for_mock.reset_mock()
monitor_sync_mock.reset_mock()
monitors_for_mock.side_effect = [{
'3.4.5.6': 'mid-3',
}]
monitor_sync_mock.side_effect = [
('mid-1', 'fid-1'),
('mid-2', 'fid-2'),
('mid-3', 'fid-3'),
]
# Modify the record data before creating the Record object
rule0 = self.record_data['dynamic']['rules'][0]
rule0_saved_geos = rule0['geos']
rule0['geos'] = ['AF', 'EU']
rule1 = self.record_data['dynamic']['rules'].pop(1)
# Create a local record object without reuse of catchall
zone = Zone('unit.tests.', [])
record = Record.new(zone, '', self.record_data)
ret, _ = provider._params_for_A(record)
self.assertEquals(ret['filters'],
Ns1Provider._FILTER_CHAIN_WITH_REGION(provider,
True))
# Restore record_data
rule0['geos'] = rule0_saved_geos
self.record_data['dynamic']['rules'].insert(1, rule1)
@patch('octodns.provider.ns1.Ns1Provider._monitor_sync')
@patch('octodns.provider.ns1.Ns1Provider._monitors_for')
def test_params_for_dynamic_oceania(self, monitors_for_mock,
@@ -1137,16 +1166,16 @@ class TestNs1ProviderDynamic(TestCase):
'meta': {
'priority': 1,
'weight': 12,
'note': 'from:iad_shadow',
'note': 'from:catchall_iad',
},
'region': 'iad_shadow',
'region': 'catchall_iad',
}, {
'answer': ['1.2.3.4'],
'meta': {
'priority': 2,
'note': 'from:--default--',
},
'region': 'iad_shadow',
'region': 'catchall_iad',
}],
'domain': 'unit.tests',
'filters': filters,
@@ -1159,13 +1188,13 @@ class TestNs1ProviderDynamic(TestCase):
'us_state': ['OR'],
},
},
'iad_shadow': {
'iad': {
'meta': {
'note': 'rule-order:2',
'country': ['ZW'],
},
},
'iad': {
'catchall_iad': {
'meta': {
'note': 'rule-order:3',
},