netbox-plugin-dns 1.3b1__py3-none-any.whl → 1.3.1__py3-none-any.whl

netbox_dns/api/serializers_/view.py

@@ -12,6 +12,34 @@ __all__ = ("ViewSerializer",)
 
 
 class ViewSerializer(NetBoxModelSerializer):
+    class Meta:
+        model = View
+
+        fields = (
+            "id",
+            "url",
+            "display",
+            "name",
+            "default_view",
+            "tags",
+            "description",
+            "created",
+            "last_updated",
+            "custom_fields",
+            "tenant",
+            "prefixes",
+            "ip_address_filter",
+        )
+
+        brief_fields = (
+            "id",
+            "url",
+            "display",
+            "name",
+            "default_view",
+            "description",
+        )
+
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:view-detail"
     )
@@ -50,22 +78,3 @@ class ViewSerializer(NetBoxModelSerializer):
             view.prefixes.set(prefixes)
 
         return view
-
-    class Meta:
-        model = View
-        fields = (
-            "id",
-            "url",
-            "display",
-            "name",
-            "default_view",
-            "tags",
-            "description",
-            "created",
-            "last_updated",
-            "custom_fields",
-            "tenant",
-            "prefixes",
-            "ip_address_filter",
-        )
-        brief_fields = ("id", "url", "display", "name", "default_view", "description")

netbox_dns/api/serializers_/zone.py

@@ -21,6 +21,64 @@ __all__ = ("ZoneSerializer",)
 
 
 class ZoneSerializer(NetBoxModelSerializer):
+    class Meta:
+        model = Zone
+
+        fields = (
+            "id",
+            "url",
+            "name",
+            "view",
+            "display",
+            "nameservers",
+            "status",
+            "description",
+            "tags",
+            "created",
+            "last_updated",
+            "default_ttl",
+            "soa_ttl",
+            "soa_mname",
+            "soa_rname",
+            "soa_serial",
+            "soa_serial_auto",
+            "soa_refresh",
+            "soa_retry",
+            "soa_expire",
+            "soa_minimum",
+            "rfc2317_prefix",
+            "rfc2317_parent_managed",
+            "rfc2317_parent_zone",
+            "rfc2317_child_zones",
+            "dnssec_policy",
+            "inline_signing",
+            "parental_agents",
+            "registrar",
+            "registry_domain_id",
+            "expiration_date",
+            "domain_status",
+            "registrant",
+            "tech_c",
+            "admin_c",
+            "billing_c",
+            "active",
+            "custom_fields",
+            "tenant",
+            "template",
+        )
+
+        brief_fields = (
+            "id",
+            "url",
+            "name",
+            "view",
+            "display",
+            "status",
+            "description",
+            "rfc2317_prefix",
+            "active",
+        )
+
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:zone-detail"
     )
@@ -39,8 +97,14 @@ class ZoneSerializer(NetBoxModelSerializer):
         required=False,
         help_text=_("Nameservers for the zone"),
     )
-    default_ttl = TimePeriodField(required=False, allow_null=True)
-    soa_ttl = TimePeriodField(required=False, allow_null=True)
+    default_ttl = TimePeriodField(
+        required=False,
+        allow_null=True,
+    )
+    soa_ttl = TimePeriodField(
+        required=False,
+        allow_null=True,
+    )
     soa_mname = NameServerSerializer(
         nested=True,
         many=False,
@@ -54,10 +118,22 @@ class ZoneSerializer(NetBoxModelSerializer):
         required=False,
         help_text=_("Contact email for the zone"),
     )
-    soa_refresh = TimePeriodField(required=False, allow_null=True)
-    soa_retry = TimePeriodField(required=False, allow_null=True)
-    soa_expire = TimePeriodField(required=False, allow_null=True)
-    soa_minimum = TimePeriodField(required=False, allow_null=True)
+    soa_refresh = TimePeriodField(
+        required=False,
+        allow_null=True,
+    )
+    soa_retry = TimePeriodField(
+        required=False,
+        allow_null=True,
+    )
+    soa_expire = TimePeriodField(
+        required=False,
+        allow_null=True,
+    )
+    soa_minimum = TimePeriodField(
+        required=False,
+        allow_null=True,
+    )
     rfc2317_parent_zone = NestedZoneSerializer(
         many=False,
         read_only=True,
@@ -124,7 +200,11 @@ class ZoneSerializer(NetBoxModelSerializer):
         read_only=True,
         allow_null=True,
     )
-    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    tenant = TenantSerializer(
+        nested=True,
+        required=False,
+        allow_null=True,
+    )
 
     def validate(self, data):
         if isinstance(data, dict) and (template := data.get("template")) is not None:
@@ -159,58 +239,3 @@ class ZoneSerializer(NetBoxModelSerializer):
             template.apply_to_zone_relations(zone)
 
         return zone
-
-    class Meta:
-        model = Zone
-        fields = (
-            "id",
-            "url",
-            "name",
-            "view",
-            "display",
-            "nameservers",
-            "status",
-            "description",
-            "tags",
-            "created",
-            "last_updated",
-            "default_ttl",
-            "soa_ttl",
-            "soa_mname",
-            "soa_rname",
-            "soa_serial",
-            "soa_serial_auto",
-            "soa_refresh",
-            "soa_retry",
-            "soa_expire",
-            "soa_minimum",
-            "rfc2317_prefix",
-            "rfc2317_parent_managed",
-            "rfc2317_parent_zone",
-            "rfc2317_child_zones",
-            "dnssec_policy",
-            "inline_signing",
-            "registrar",
-            "registry_domain_id",
-            "expiration_date",
-            "domain_status",
-            "registrant",
-            "tech_c",
-            "admin_c",
-            "billing_c",
-            "active",
-            "custom_fields",
-            "tenant",
-            "template",
-        )
-        brief_fields = (
-            "id",
-            "url",
-            "name",
-            "view",
-            "display",
-            "status",
-            "description",
-            "rfc2317_prefix",
-            "active",
-        )

netbox_dns/api/serializers_/zone_template.py

@@ -17,6 +17,41 @@ __all__ = ("ZoneTemplateSerializer",)
 
 
 class ZoneTemplateSerializer(NetBoxModelSerializer):
+    class Meta:
+        model = ZoneTemplate
+
+        fields = (
+            "id",
+            "url",
+            "name",
+            "description",
+            "display",
+            "nameservers",
+            "soa_mname",
+            "soa_rname",
+            "dnssec_policy",
+            "registrar",
+            "registrant",
+            "tech_c",
+            "admin_c",
+            "billing_c",
+            "active",
+            "tags",
+            "created",
+            "last_updated",
+            "custom_fields",
+            "tenant",
+            "record_templates",
+        )
+
+        brief_fields = (
+            "id",
+            "url",
+            "name",
+            "display",
+            "description",
+        )
+
     url = serializers.HyperlinkedIdentityField(
         view_name="plugins-api:netbox_dns-api:zonetemplate-detail"
     )
@@ -87,7 +122,11 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
         read_only=True,
         allow_null=True,
     )
-    tenant = TenantSerializer(nested=True, required=False, allow_null=True)
+    tenant = TenantSerializer(
+        nested=True,
+        required=False,
+        allow_null=True,
+    )
 
     def create(self, validated_data):
         nameservers = validated_data.pop("nameservers", None)
@@ -114,36 +153,3 @@ class ZoneTemplateSerializer(NetBoxModelSerializer):
             zone_template.record_templates.set(record_templates)
 
         return zone_template
-
-    class Meta:
-        model = ZoneTemplate
-        fields = (
-            "id",
-            "url",
-            "name",
-            "description",
-            "display",
-            "nameservers",
-            "soa_mname",
-            "soa_rname",
-            "dnssec_policy",
-            "registrar",
-            "registrant",
-            "tech_c",
-            "admin_c",
-            "billing_c",
-            "active",
-            "tags",
-            "created",
-            "last_updated",
-            "custom_fields",
-            "tenant",
-            "record_templates",
-        )
-        brief_fields = (
-            "id",
-            "url",
-            "name",
-            "display",
-            "description",
-        )

netbox_dns/choices/dnssec_key_template.py

@@ -53,6 +53,10 @@ class DNSSECKeyTemplateKeySizeChoices(ChoiceSet):
         (SIZE_4096, 4096),
     ]
 
+    @classmethod
+    def as_enum(cls):
+        return super().as_enum(prefix="SIZE")
+
 
 @initialize_choice_names
 class DNSSECKeyTemplateAlgorithmChoices(ChoiceSet):

netbox_dns/choices/record.py

@@ -17,8 +17,10 @@ __all__ = (
 
 
 def _get_config_option(option_name):
-    return get_plugin_config("netbox_dns", option_name, []) + get_plugin_config(
-        "netbox_dns", f"{option_name}+", []
+    return list(
+        set(get_plugin_config("netbox_dns", option_name, []))
+        | set(get_plugin_config("netbox_dns", f"{option_name}+", []))
+        - set(get_plugin_config("netbox_dns", f"{option_name}-", []))
     )
 
 

netbox_dns/filtersets/dnssec_key_template.py

@@ -17,6 +17,16 @@ __all__ = ("DNSSECKeyTemplateFilterSet",)
 
 
 class DNSSECKeyTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
+    class Meta:
+        model = DNSSECKeyTemplate
+
+        fields = (
+            "id",
+            "name",
+            "description",
+            "lifetime",
+        )
+
     type = django_filters.MultipleChoiceFilter(
         choices=DNSSECKeyTemplateTypeChoices,
     )
@@ -40,10 +50,6 @@ class DNSSECKeyTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("DNSSEC Policies"),
     )
 
-    class Meta:
-        model = DNSSECKeyTemplate
-        fields = ("id", "name", "description", "lifetime")
-
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset

netbox_dns/filtersets/dnssec_policy.py

@@ -10,12 +10,14 @@ from utilities.filters import MultiValueCharFilter
 from netbox_dns.models import DNSSECPolicy, DNSSECKeyTemplate, Zone, ZoneTemplate
 from netbox_dns.choices import DNSSECPolicyStatusChoices
 
+
 __all__ = ("DNSSECPolicyFilterSet",)
 
 
 class DNSSECPolicyFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     class Meta:
         model = DNSSECPolicy
+
         fields = (
             "id",
             "name",

netbox_dns/filtersets/nameserver.py

@@ -12,6 +12,15 @@ __all__ = ("NameServerFilterSet",)
 
 
 class NameServerFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
+    class Meta:
+        model = NameServer
+
+        fields = (
+            "id",
+            "name",
+            "description",
+        )
+
     zone_id = django_filters.ModelMultipleChoiceFilter(
         field_name="zones",
         queryset=Zone.objects.all(),
@@ -24,10 +33,6 @@ class NameServerFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("SOA Zones"),
     )
 
-    class Meta:
-        model = NameServer
-        fields = ("id", "name", "description")
-
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset

netbox_dns/filtersets/record.py

@@ -18,6 +18,20 @@ __all__ = ("RecordFilterSet",)
 
 
 class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
+    class Meta:
+        model = Record
+
+        fields = (
+            "id",
+            "name",
+            "fqdn",
+            "description",
+            "ttl",
+            "value",
+            "disable_ptr",
+            "managed",
+        )
+
     fqdn = MultiValueCharFilter(
         method="filter_fqdn",
     )
@@ -49,10 +63,10 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("View the Parent Zone belongs to"),
     )
     address_record_id = django_filters.ModelMultipleChoiceFilter(
-        field_name="address_record",
+        field_name="address_records",
         queryset=Record.objects.all(),
         to_field_name="id",
-        label=_("Address Record"),
+        label=_("Address Records"),
     )
     ptr_record_id = django_filters.ModelMultipleChoiceFilter(
         field_name="ptr_record",
@@ -82,19 +96,6 @@ class RecordFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
 
     managed = django_filters.BooleanFilter()
 
-    class Meta:
-        model = Record
-        fields = (
-            "id",
-            "name",
-            "fqdn",
-            "description",
-            "ttl",
-            "value",
-            "disable_ptr",
-            "managed",
-        )
-
     def filter_fqdn(self, queryset, name, value):
         if not value:
             return queryset

netbox_dns/filtersets/record_template.py

@@ -13,6 +13,19 @@ __all__ = ("RecordTemplateFilterSet",)
 
 
 class RecordTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
+    class Meta:
+        model = RecordTemplate
+
+        fields = (
+            "id",
+            "name",
+            "record_name",
+            "value",
+            "description",
+            "ttl",
+            "disable_ptr",
+        )
+
     type = django_filters.MultipleChoiceFilter(
         choices=RecordTypeChoices,
     )
@@ -32,18 +45,6 @@ class RecordTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("Zone Template ID"),
     )
 
-    class Meta:
-        model = RecordTemplate
-        fields = (
-            "id",
-            "name",
-            "record_name",
-            "value",
-            "description",
-            "ttl",
-            "disable_ptr",
-        )
-
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset

netbox_dns/filtersets/registrar.py

@@ -11,6 +11,7 @@ __all__ = ("RegistrarFilterSet",)
 class RegistrarFilterSet(NetBoxModelFilterSet):
     class Meta:
         model = Registrar
+
         fields = (
             "id",
             "name",

netbox_dns/filtersets/registration_contact.py

@@ -11,6 +11,7 @@ __all__ = ("RegistrationContactFilterSet",)
 class RegistrationContactFilterSet(NetBoxModelFilterSet):
     class Meta:
         model = RegistrationContact
+
         fields = (
             "id",
             "name",

netbox_dns/filtersets/view.py

@@ -14,6 +14,16 @@ __all__ = ("ViewFilterSet",)
 
 
 class ViewFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
+    class Meta:
+        model = View
+
+        fields = (
+            "id",
+            "name",
+            "default_view",
+            "description",
+        )
+
     prefix_id = django_filters.ModelMultipleChoiceFilter(
         queryset=Prefix.objects.all(),
         field_name="prefixes",
@@ -27,10 +37,6 @@ class ViewFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
         label=_("Prefix"),
     )
 
-    class Meta:
-        model = View
-        fields = ("id", "name", "default_view", "description")
-
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset

netbox_dns/filtersets/zone.py

@@ -1,4 +1,5 @@
 import netaddr
+from netaddr.core import AddrFormatError
 
 import django_filters
 from django.db.models import Q
@@ -23,6 +24,28 @@ __all__ = ("ZoneFilterSet",)
 
 
 class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
+    class Meta:
+        model = Zone
+
+        fields = (
+            "id",
+            "name",
+            "description",
+            "default_ttl",
+            "soa_ttl",
+            "soa_rname",
+            "soa_serial",
+            "soa_refresh",
+            "soa_retry",
+            "soa_expire",
+            "soa_minimum",
+            "soa_serial_auto",
+            "rfc2317_parent_managed",
+            "inline_signing",
+            "registry_domain_id",
+            "domain_status",
+        )
+
     status = django_filters.MultipleChoiceFilter(
         choices=ZoneStatusChoices,
     )
@@ -68,6 +91,10 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         to_field_name="name",
         label=_("DNSSEC Policy"),
     )
+    parental_agents = MultiValueCharFilter(
+        method="filter_parental_agents",
+        label=_("Parental Agents"),
+    )
     rfc2317_prefix = MultiValueCharFilter(
         method="filter_rfc2317_prefix",
         label=_("RFC2317 Prefix"),
@@ -146,26 +173,18 @@ class ZoneFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("Zone is active"),
     )
 
-    class Meta:
-        model = Zone
-        fields = (
-            "id",
-            "name",
-            "description",
-            "default_ttl",
-            "soa_ttl",
-            "soa_rname",
-            "soa_serial",
-            "soa_refresh",
-            "soa_retry",
-            "soa_expire",
-            "soa_minimum",
-            "soa_serial_auto",
-            "rfc2317_parent_managed",
-            "inline_signing",
-            "registry_domain_id",
-            "domain_status",
-        )
+    def filter_parental_agents(self, queryset, name, value):
+        if not value:
+            return queryset
+
+        query_values = []
+        for v in value:
+            try:
+                query_values.append(str(netaddr.IPAddress(v)))
+            except (AddrFormatError, ValueError):
+                pass
+
+        return queryset.filter(parental_agents__overlap=query_values)
 
     def filter_arpa_network(self, queryset, name, value):
         if not value:

netbox_dns/filtersets/zone_template.py

@@ -20,6 +20,16 @@ __all__ = ("ZoneTemplateFilterSet",)
 
 
 class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
+    class Meta:
+        model = ZoneTemplate
+
+        fields = (
+            "id",
+            "name",
+            "description",
+            "soa_rname",
+        )
+
     record_template_id = django_filters.ModelMultipleChoiceFilter(
         queryset=RecordTemplate.objects.all(),
         field_name="record_templates",
@@ -117,15 +127,6 @@ class ZoneTemplateFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
         label=_("Billing Contact"),
     )
 
-    class Meta:
-        model = ZoneTemplate
-        fields = (
-            "id",
-            "name",
-            "description",
-            "soa_rname",
-        )
-
     def search(self, queryset, name, value):
         if not value.strip():
             return queryset