src/octodns_netbox_dns/__init__.py

@@ -75,18 +75,14 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
         self.make_absolute = make_absolute
         self.disable_ptr = disable_ptr
 
-    def _make_absolute(self, value: str, force: bool = False) -> str:
+    def _make_absolute(self, value: str) -> str:
         """return dns name with trailing dot to make it absolute
 
         @param value: dns record value
-        @param force: when `True`, disregard configuration option `make_absolute`
 
         @return: absolute dns record value
         """
-        if value.endswith("."):
+        if not self.make_absolute or value.endswith("."):
-            return value
-
-        if not (self.make_absolute or force):
             return value
 
         absolute_value = value + "."
@@ -442,6 +438,5 @@ class NetBoxDNSProvider(octodns.provider.base.BaseProvider):
         """
         query_params = {"status": "active", **self.nb_view}
         zones = self.api.plugins.netbox_dns.zones.filter(**query_params)
-        absolute_zones = [self._make_absolute(z.name, True) for z in zones]
 
-        return sorted(absolute_zones)
+        return sorted([self._make_absolute(z.name) for z in zones])

tests/test_make_absolute.py

@@ -11,7 +11,7 @@ DEFAULT_CONFIG = {
 }
 
 
-def test_absolute():
+def test1():
     nbdns = NetBoxDNSProvider(**DEFAULT_CONFIG)
     rcd = "example.com"
     absolute = nbdns._make_absolute(rcd)
@@ -19,27 +19,9 @@ def test_absolute():
     assert absolute == "example.com."
 
 
-def test_noop():
+def test2():
     nbdns = NetBoxDNSProvider(**DEFAULT_CONFIG)
     rcd = "example.com."
     absolute = nbdns._make_absolute(rcd)
 
     assert absolute == "example.com."
-
-
-def test_disabled():
-    args = {**DEFAULT_CONFIG, "make_absolute": False}
-    nbdns = NetBoxDNSProvider(**args)
-    rcd = "example.com"
-    relative = nbdns._make_absolute(rcd, force=False)
-
-    assert relative == "example.com"
-
-
-def test_force():
-    args = {**DEFAULT_CONFIG, "make_absolute": False}
-    nbdns = NetBoxDNSProvider(**args)
-    rcd = "example.com"
-    absolute = nbdns._make_absolute(rcd, force=True)
-
-    assert absolute == "example.com."