diff --git a/netbox_dns_bridge/catalog_zone_manager.py b/netbox_dns_bridge/catalog_zone_manager.py index 4e2d439..1670133 100644 --- a/netbox_dns_bridge/catalog_zone_manager.py +++ b/netbox_dns_bridge/catalog_zone_manager.py @@ -4,7 +4,6 @@ import dns.rdatatype import dns.rdataclass from .logger import get_logger from netbox_dns.models import Zone -from netbox_dns.choices import ZoneStatusChoices from netbox_dns_bridge.models import IntegerKeyValueSetting, CatalogZoneMemberIdentifier from uuid import uuid4 from base64 import b32encode @@ -87,7 +86,7 @@ def create_zone(name, view_name) -> dns.zone.Zone: # get zones from netbox nb_zones = Zone.objects.filter( - view__name=view_name, status=ZoneStatusChoices.STATUS_ACTIVE + view__name=view_name, active=True ).select_related("catz_identifier") ptr_base = dns.name.from_text("zones", origin) diff --git a/netbox_dns_bridge/request_handler.py b/netbox_dns_bridge/request_handler.py index 24e472f..9995b52 100644 --- a/netbox_dns_bridge/request_handler.py +++ b/netbox_dns_bridge/request_handler.py @@ -13,7 +13,6 @@ import dns.renderer from .logger import get_logger from django.utils import timezone from netbox_dns.models import Zone, Record -from netbox_dns.choices import ZoneStatusChoices, RecordStatusChoices from netbox_dns_bridge import catalog_zone_manager as catzm from .models import SeenTransferClients @@ -33,7 +32,7 @@ class DNSBaseRequestHandler(socketserver.BaseRequestHandler): nb_zone = Zone.objects.get( name=zone_name, view__name=view_name, - status=ZoneStatusChoices.STATUS_ACTIVE, + active=True, ) except Zone.DoesNotExist: return None @@ -43,7 +42,7 @@ class DNSBaseRequestHandler(socketserver.BaseRequestHandler): zone.rdclass = dns.rdataclass.IN nb_records = Record.objects.filter( - zone=nb_zone, status=RecordStatusChoices.STATUS_ACTIVE + zone=nb_zone, active=True ) rdatasets_dict = {}