diff --git a/.devcontainer/Dockerfile-plugin_dev b/.devcontainer/Dockerfile-plugin_dev index 9c17ee4..5ec931d 100644 --- a/.devcontainer/Dockerfile-plugin_dev +++ b/.devcontainer/Dockerfile-plugin_dev @@ -1,8 +1,8 @@ -ARG NETBOX_VARIANT=v3.2 +ARG NETBOX_VARIANT=v3.3 FROM netboxcommunity/netbox:${NETBOX_VARIANT} -ARG NETBOX_INITIALIZERS_VARIANT=3.2.3 +ARG NETBOX_INITIALIZERS_VARIANT=3.3.1 ARG DEBIAN_FRONTEND=noninteractive diff --git a/README.md b/README.md index f2f6310..f609763 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ This plugin was first developed using 3.2.5, and tested with all of 3.2. | NetBox Version | Plugin Version | |----------------|----------------| | 3.2 | 1.0.1 | -| 3.3 | TBD | +| 3.3 | 1.1.0 | ## Installing diff --git a/netbox_acls/api/serializers.py b/netbox_acls/api/serializers.py index 10d9cb7..e5dd7a2 100644 --- a/netbox_acls/api/serializers.py +++ b/netbox_acls/api/serializers.py @@ -7,15 +7,12 @@ from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from drf_yasg.utils import swagger_serializer_method from ipam.api.serializers import NestedPrefixSerializer -from netbox.api import ContentTypeField +from netbox.api.fields import ContentTypeField from netbox.api.serializers import NetBoxModelSerializer from rest_framework import serializers from utilities.api import get_serializer_for_model -from ..constants import ( - ACL_HOST_ASSIGNMENT_MODELS, - ACL_INTERFACE_ASSIGNMENT_MODELS, -) +from ..constants import ACL_HOST_ASSIGNMENT_MODELS, ACL_INTERFACE_ASSIGNMENT_MODELS from ..models import ( AccessList, ACLExtendedRule, diff --git a/setup.py b/setup.py index a8fc59a..1ed86ec 100644 --- a/setup.py +++ b/setup.py @@ -15,10 +15,10 @@ def read(rel_path): setup( name="netbox-acls", - version="1.0.1", + version="1.1.0", # version=get_version("netbox_acls/version.py"), description="A NetBox plugin for Access List management", - # long_description=long_description, + long_description=long_description, long_description_content_type="text/markdown", url="https://github.com/ryanmerolle/netbox-acls", install_requires=[],