From da9e26865982dd9c37678c923eb3fda224d27f58 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Wed, 9 Jan 2019 10:54:21 -0800 Subject: [PATCH] 3-part Dyn TD labels are no more --- octodns/provider/dyn.py | 10 +++------- tests/test_octodns_provider_dyn.py | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/octodns/provider/dyn.py b/octodns/provider/dyn.py index 31a715f..0c23b45 100644 --- a/octodns/provider/dyn.py +++ b/octodns/provider/dyn.py @@ -399,14 +399,10 @@ class DynProvider(BaseProvider): tds = defaultdict(dict) for td in get_all_dsf_services(): try: - _, fqdn, _type = td.label.split(':', 2) + fqdn, _type = td.label.split(':', 1) except ValueError: - try: - fqdn, _type = td.label.split(':', 1) - except ValueError: - self.log.warn("Unsupported TrafficDirector '%s'", - td.label) - continue + self.log.warn("Unsupported TrafficDirector '%s'", td.label) + continue tds[fqdn][_type] = td self._traffic_directors = dict(tds) diff --git a/tests/test_octodns_provider_dyn.py b/tests/test_octodns_provider_dyn.py index 4a41698..328cc69 100644 --- a/tests/test_octodns_provider_dyn.py +++ b/tests/test_octodns_provider_dyn.py @@ -1626,7 +1626,7 @@ class DummyRuleset(object): class DummyTrafficDirector(object): def __init__(self, rulesets=[], response_pools=[], ttl=42): - self.label = 'dynamic:dummy' + self.label = 'dummy:abcdef1234567890' self.rulesets = rulesets self.all_response_pools = response_pools self.ttl = ttl