diff --git a/octodns/provider/ns1.py b/octodns/provider/ns1.py index 19b33af..cf78241 100644 --- a/octodns/provider/ns1.py +++ b/octodns/provider/ns1.py @@ -23,7 +23,7 @@ class Ns1Provider(BaseProvider): ''' Ns1 provider - nsone: + ns1: class: octodns.provider.ns1.Ns1Provider api_key: env/NS1_API_KEY ''' @@ -191,14 +191,14 @@ class Ns1Provider(BaseProvider): target, lenient) try: - nsone_zone_name = zone.name[:-1] - nsone_zone = self._zones.retrieve(nsone_zone_name) + ns1_zone_name = zone.name[:-1] + ns1_zone = self._zones.retrieve(ns1_zone_name) records = [] geo_records = [] # change answers for certain types to always be absolute - for record in nsone_zone['records']: + for record in ns1_zone['records']: if record['type'] in ['ALIAS', 'CNAME', 'MX', 'NS', 'PTR', 'SRV']: for i, a in enumerate(record['short_answers']): @@ -207,7 +207,7 @@ class Ns1Provider(BaseProvider): if record.get('tier', 1) > 1: # Need to get the full record data for geo records - record = self._records.retrieve(nsone_zone_name, + record = self._records.retrieve(ns1_zone_name, record['domain'], record['type']) geo_records.append(record) @@ -312,7 +312,7 @@ class Ns1Provider(BaseProvider): for v in record.values] return {'answers': values, 'ttl': record.ttl} - def _apply_Create(self, nsone_zone, change): + def _apply_Create(self, ns1_zone, change): new = change.new zone = new.zone.name[:-1] domain = new.fqdn[:-1] @@ -327,7 +327,7 @@ class Ns1Provider(BaseProvider): sleep(period) self._records.create(zone, domain, _type, **params) - def _apply_Update(self, nsone_zone, change): + def _apply_Update(self, ns1_zone, change): new = change.new zone = new.zone.name[:-1] domain = new.fqdn[:-1] @@ -342,7 +342,7 @@ class Ns1Provider(BaseProvider): sleep(period) self._records.update(zone, domain, _type, **params) - def _apply_Delete(self, nsone_zone, change): + def _apply_Delete(self, ns1_zone, change): existing = change.existing zone = existing.zone.name[:-1] domain = existing.fqdn[:-1] @@ -364,14 +364,14 @@ class Ns1Provider(BaseProvider): domain_name = desired.name[:-1] try: - nsone_zone = self._zones.retrieve(domain_name) + ns1_zone = self._zones.retrieve(domain_name) except ResourceException as e: if e.message != self.ZONE_NOT_FOUND_MESSAGE: raise self.log.debug('_apply: no matching zone, creating') - nsone_zone = self._zones.create(domain_name) + ns1_zone = self._zones.create(domain_name) for change in changes: class_name = change.__class__.__name__ - getattr(self, '_apply_{}'.format(class_name))(nsone_zone, + getattr(self, '_apply_{}'.format(class_name))(ns1_zone, change) diff --git a/tests/test_octodns_provider_ns1.py b/tests/test_octodns_provider_ns1.py index 9034552..0f23222 100644 --- a/tests/test_octodns_provider_ns1.py +++ b/tests/test_octodns_provider_ns1.py @@ -108,7 +108,7 @@ class TestNs1Provider(TestCase): }, })) - nsone_records = [{ + ns1_records = [{ 'type': 'A', 'ttl': 32, 'short_answers': ['1.2.3.4'], @@ -196,7 +196,7 @@ class TestNs1Provider(TestCase): # Existing zone w/o records zone_retrieve_mock.reset_mock() - nsone_zone = { + ns1_zone = { 'records': [{ "domain": "geo.unit.tests", "zone": "unit.tests", @@ -213,7 +213,7 @@ class TestNs1Provider(TestCase): 'ttl': 34, }], } - zone_retrieve_mock.side_effect = [nsone_zone] + zone_retrieve_mock.side_effect = [ns1_zone] zone = Zone('unit.tests.', []) provider.populate(zone) self.assertEquals(1, len(zone.records)) @@ -221,8 +221,8 @@ class TestNs1Provider(TestCase): # Existing zone w/records zone_retrieve_mock.reset_mock() - nsone_zone = { - 'records': self.nsone_records + [{ + ns1_zone = { + 'records': self.ns1_records + [{ "domain": "geo.unit.tests", "zone": "unit.tests", "type": "A", @@ -238,7 +238,7 @@ class TestNs1Provider(TestCase): 'ttl': 34, }], } - zone_retrieve_mock.side_effect = [nsone_zone] + zone_retrieve_mock.side_effect = [ns1_zone] zone = Zone('unit.tests.', []) provider.populate(zone) self.assertEquals(self.expected, zone.records) @@ -246,8 +246,8 @@ class TestNs1Provider(TestCase): # Test skipping unsupported record type zone_retrieve_mock.reset_mock() - nsone_zone = { - 'records': self.nsone_records + [{ + ns1_zone = { + 'records': self.ns1_records + [{ 'type': 'UNSUPPORTED', 'ttl': 42, 'short_answers': ['unsupported'], @@ -268,7 +268,7 @@ class TestNs1Provider(TestCase): 'ttl': 34, }], } - zone_retrieve_mock.side_effect = [nsone_zone] + zone_retrieve_mock.side_effect = [ns1_zone] zone = Zone('unit.tests.', []) provider.populate(zone) self.assertEquals(self.expected, zone.records) @@ -347,8 +347,8 @@ class TestNs1Provider(TestCase): zone_retrieve_mock.reset_mock() zone_create_mock.reset_mock() - nsone_zone = { - 'records': self.nsone_records + [{ + ns1_zone = { + 'records': self.ns1_records + [{ 'type': 'A', 'ttl': 42, 'short_answers': ['9.9.9.9'], @@ -368,7 +368,7 @@ class TestNs1Provider(TestCase): 'ttl': 34, }], } - nsone_zone['records'][0]['short_answers'][0] = '2.2.2.2' + ns1_zone['records'][0]['short_answers'][0] = '2.2.2.2' record_retrieve_mock.side_effect = [{ "domain": "geo.unit.tests", @@ -387,7 +387,7 @@ class TestNs1Provider(TestCase): 'ttl': 34, }] - zone_retrieve_mock.side_effect = [nsone_zone, nsone_zone] + zone_retrieve_mock.side_effect = [ns1_zone, ns1_zone] plan = provider.plan(desired) self.assertEquals(3, len(plan.changes)) # Shouldn't rely on order so just count classes @@ -470,7 +470,7 @@ class TestNs1Provider(TestCase): def test_data_for_CNAME(self): provider = Ns1Provider('test', 'api-key') - # answers from nsone + # answers from ns1 a_record = { 'ttl': 31, 'type': 'CNAME', @@ -484,7 +484,7 @@ class TestNs1Provider(TestCase): self.assertEqual(a_expected, provider._data_for_CNAME(a_record['type'], a_record)) - # no answers from nsone + # no answers from ns1 b_record = { 'ttl': 32, 'type': 'CNAME',