From f8251ad8ffcf6f92dfcf1dfdcffe954ac55eee4c Mon Sep 17 00:00:00 2001 From: Lukasz Polanski Date: Mon, 11 Jul 2022 13:59:29 +0200 Subject: [PATCH] fix 'Abstract base class, log property missing' --- .gitignore | 1 + octodns_netbox_dns/__init__.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index bee8a64..6d17870 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ __pycache__ +.env \ No newline at end of file diff --git a/octodns_netbox_dns/__init__.py b/octodns_netbox_dns/__init__.py index daeff1f..7fbef7b 100644 --- a/octodns_netbox_dns/__init__.py +++ b/octodns_netbox_dns/__init__.py @@ -48,14 +48,14 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): } _api: pynetbox.core.api.Api - _log: logging.Logger + # log: logging.Logger _nb_view: pynetbox.core.response.Record | None _ttl: int def __init__(self, id: int, url: str, token: str, view: str | None, ttl=3600): """Initialize the NetboxDNSSource.""" - self._log = logging.getLogger(f"NetboxDNSSource[{id}]") - self._log.debug(f"__init__: id={id}, url={url}, view={view}") + self.log = logging.getLogger(f"NetboxDNSSource[{id}]") + self.log.debug(f"__init__: id={id}, url={url}, view={view}") super(NetBoxDNSSource, self).__init__(id) self._api = pynetbox.core.api.Api(url, token) self._nb_view = None @@ -63,7 +63,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): self._nb_view = self._api.plugins.netbox_dns.views.get(name=view) if self._nb_view is None: raise ValueError - self._log.debug(f"found {self._nb_view.name} {self._nb_view.id}") + self.log.debug(f"found {self._nb_view.name} {self._nb_view.id}") self._ttl = ttl def _get_nb_zone(self, name: str) -> pynetbox.core.response.Record: @@ -80,7 +80,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): view_id=self._nb_view.id, name=name[:-1] ) for nb_zone in nb_zones: - self._log.debug(f"{nb_zone.name} {nb_zone.view.id}") + self.log.debug(f"{nb_zone.name} {nb_zone.view.id}") if nb_zone.name == name[:-1] and nb_zone.view.id == self._nb_view.id: return nb_zone @@ -90,7 +90,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): self, zone: octodns.zone.Zone, target: bool = False, lenient: bool = False ): """Get all of the records of a zone from NetBox and add them to the OctoDNS zone.""" - self._log.debug( + self.log.debug( f"populate: name={zone.name}, target={target}, lenient={lenient}" ) @@ -100,7 +100,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): nb_records = self._api.plugins.netbox_dns.records.filter(zone_id=nb_zone.id) for nb_record in nb_records: - self._log.debug( + self.log.debug( f"{nb_record.name!r} {nb_record.type!r} {nb_record.value!r}" ) name = nb_record.name @@ -167,7 +167,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): } case "SOA": - self._log.debug("SOA") + self.log.debug("SOA") continue case "SPF" | "TXT": @@ -203,7 +203,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): def _apply(self, plan: octodns.provider.plan.Plan): """Apply the changes to the NetBox DNS zone.""" - self._log.debug( + self.log.debug( f"_apply: zone={plan.desired.name}, len(changes)={len(plan.changes)}" ) @@ -234,7 +234,7 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): value=value, disable_ptr=True, ) - self._log.debug(f"{nb_record!r}") + self.log.debug(f"{nb_record!r}") case octodns.record.Delete(): name = change.existing.name @@ -260,10 +260,10 @@ class NetBoxDNSSource(octodns.provider.base.BaseProvider): for nb_record in nb_records: for value in existing: if nb_record.value == value: - self._log.debug( + self.log.debug( f"{nb_record.id} {nb_record.name} {nb_record.type} {nb_record.value} {value}" ) - self._log.debug( + self.log.debug( f"{nb_record.url} {nb_record.endpoint.url}" ) nb_record.delete()