From 2c5d8ad10194855bbd93823b552471f03ccd96d7 Mon Sep 17 00:00:00 2001 From: Ross McFarland Date: Thu, 22 Sep 2022 20:29:08 -0700 Subject: [PATCH] Flip ttl and type return order --- octodns/record/__init__.py | 4 ++-- tests/test_octodns_record.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/octodns/record/__init__.py b/octodns/record/__init__.py index 2d544cc..fc504a1 100644 --- a/octodns/record/__init__.py +++ b/octodns/record/__init__.py @@ -421,8 +421,8 @@ class ValuesMixin(object): def rrs(self): return ( self.fqdn, - self._type, self.ttl, + self._type, [v.rdata_text for v in self.values], ) @@ -521,7 +521,7 @@ class ValueMixin(object): @property def rrs(self): - return self.fqdn, self._type, self.ttl, [self.value.rdata_text] + return self.fqdn, self.ttl, self._type, [self.value.rdata_text] def __repr__(self): klass = self.__class__.__name__ diff --git a/tests/test_octodns_record.py b/tests/test_octodns_record.py index b716f43..455fbe6 100644 --- a/tests/test_octodns_record.py +++ b/tests/test_octodns_record.py @@ -2515,7 +2515,7 @@ class TestRecord(TestCase): {'ttl': 42, 'type': 'A', 'values': ['1.2.3.4', '2.3.4.5']}, ) self.assertEqual( - ('a.unit.tests.', 'A', 42, ['1.2.3.4', '2.3.4.5']), record.rrs + ('a.unit.tests.', 42, 'A', ['1.2.3.4', '2.3.4.5']), record.rrs ) record = Record.new( @@ -2524,7 +2524,7 @@ class TestRecord(TestCase): {'ttl': 43, 'type': 'CNAME', 'value': 'target.unit.tests.'}, ) self.assertEqual( - ('cname.unit.tests.', 'CNAME', 43, ['target.unit.tests.']), + ('cname.unit.tests.', 43, 'CNAME', ['target.unit.tests.']), record.rrs, )