Browse Source

adds warning to dyn provider when it cannot load a trafficdirector

pull/128/head
Tim Hughes 8 years ago
parent
commit
8352ab89ef
2 changed files with 6 additions and 2 deletions
  1. +2
    -1
      octodns/provider/dyn.py
  2. +4
    -1
      tests/test_octodns_provider_dyn.py

+ 2
- 1
octodns/provider/dyn.py View File

@ -290,7 +290,8 @@ class DynProvider(BaseProvider):
for td in get_all_dsf_services():
try:
fqdn, _type = td.label.split(':', 1)
except ValueError:
except ValueError as e:
self.log.warn("Failed to load TraficDirector '{}': {}".format(td.label, e))
continue
tds[fqdn][_type] = td
self._traffic_directors = dict(tds)


+ 4
- 1
tests/test_octodns_provider_dyn.py View File

@ -8,7 +8,7 @@ from __future__ import absolute_import, division, print_function, \
from dyn.tm.errors import DynectGetError
from dyn.tm.services.dsf import DSFResponsePool
from json import loads
from mock import MagicMock, call, patch
from mock import MagicMock, call, patch, Mock
from unittest import TestCase
from octodns.record import Create, Delete, Record, Update
@ -601,6 +601,7 @@ class TestDynProviderGeo(TestCase):
provider = DynProvider('test', 'cust', 'user', 'pass', True)
# short-circuit session checking
provider._dyn_sess = True
provider.log.warn = MagicMock()
# no tds
mock.side_effect = [{'data': []}]
@ -649,6 +650,8 @@ class TestDynProviderGeo(TestCase):
set(tds.keys()))
self.assertEquals(['A'], tds['unit.tests.'].keys())
self.assertEquals(['A'], tds['geo.unit.tests.'].keys())
provider.log.warn.assert_called_with("Failed to load TraficDirector 'something else': need more than 1 value to unpack")
@patch('dyn.core.SessionEngine.execute')
def test_traffic_director_monitor(self, mock):


Loading…
Cancel
Save