Support for NetBox v3.4

.devcontainer/Dockerfile-plugin_dev

@@ -1,8 +1,8 @@
-ARG NETBOX_VARIANT=v3.3
+ARG NETBOX_VARIANT=v3.4
 
 FROM netboxcommunity/netbox:${NETBOX_VARIANT}
 
-ARG NETBOX_INITIALIZERS_VARIANT=3.3.*
+ARG NETBOX_INITIALIZERS_VARIANT=3.4.0
 
 ARG DEBIAN_FRONTEND=noninteractive
 

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -23,14 +23,14 @@ body:
     attributes:
       label: NetBox access-list plugin version
       description: What version of the NetBox access-list plugin are you currently running?
-      placeholder: v0.1
+      placeholder: v1.2.0
     validations:
       required: true
   - type: input
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-      placeholder: v3.2.7
+      placeholder: v3.4.3
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -15,7 +15,7 @@ body:
     attributes:
       label: NetBox version
       description: What version of NetBox are you currently running?
-      placeholder: v3.2.5
+      placeholder: v3.4.3
     validations:
       required: true
   - type: dropdown

README.md

@@ -37,10 +37,13 @@ See the [CONTRIBUTING](CONTRIBUTING.md) for more information.
 Each Plugin Version listed below has been tested with its corresponding NetBox Version.
 
 | NetBox Version | Plugin Version |
-|----------------|----------------|
-|       3.2      |      1.0.1     |
-|       3.3      |      1.1.1     |
-|       3.4      |  1.2.0(coming) |
+|:--------------:|:--------------:|
+|      3.2       |     1.0.1      |
+|      3.3       |     1.1.0      |
+|      3.4       |     1.2.0      
+
+
+
 
 ## Installing
 

netbox_acls/__init__.py

@@ -17,9 +17,8 @@ class NetBoxACLsConfig(PluginConfig):
     version = __version__
     description = "Manage simple ACLs in NetBox"
     base_url = "access-lists"
-    min_version = "3.3.0"
-    max_version = "3.3.99"
-    # default_settings = {}
+    min_version = "3.4.0"
+    max_version = "3.4.99"
 
 
 config = NetBoxACLsConfig

netbox_acls/api/views.py

@@ -28,8 +28,12 @@ class AccessListViewSet(NetBoxModelViewSet):
     Defines the view set for the django AccessList model & associates it to a view.
     """
 
-    queryset = models.AccessList.objects.prefetch_related("tags").annotate(
-        rule_count=Count("aclextendedrules") + Count("aclstandardrules"),
+    queryset = (
+        models.AccessList.objects.prefetch_related("tags")
+        .annotate(
+            rule_count=Count("aclextendedrules") + Count("aclstandardrules"),
+        )
+        .prefetch_related("tags")
     )
     serializer_class = AccessListSerializer
     filterset_class = filtersets.AccessListFilterSet

netbox_acls/navigation.py

@@ -2,82 +2,77 @@
 Define the plugin menu buttons & the plugin navigation bar enteries.
 """
 
-from extras.plugins import PluginMenuButton, PluginMenuItem
+from extras.plugins import PluginMenu, PluginMenuButton, PluginMenuItem
 from utilities.choices import ButtonColorChoices
 
 #
 # Define plugin menu buttons
 #
 
-accesslist_buttons = [
-    PluginMenuButton(
-        link="plugins:netbox_acls:accesslist_add",
-        title="Add",
-        icon_class="mdi mdi-plus-thick",
-        color=ButtonColorChoices.GREEN,
-        permissions=["netbox_acls.add_accesslist"],
-    ),
-]
-
-aclstandardrule_butons = [
-    PluginMenuButton(
-        link="plugins:netbox_acls:aclstandardrule_add",
-        title="Add",
-        icon_class="mdi mdi-plus-thick",
-        color=ButtonColorChoices.GREEN,
-        permissions=["netbox_acls.add_aclstandardrule"],
-    ),
-]
-
-aclextendedrule_butons = [
-    PluginMenuButton(
-        link="plugins:netbox_acls:aclextendedrule_add",
-        title="Add",
-        icon_class="mdi mdi-plus-thick",
-        color=ButtonColorChoices.GREEN,
-        permissions=["netbox_acls.add_aclextendedrule"],
-    ),
-]
-
-accesslistassignment_buttons = [
-    PluginMenuButton(
-        link="plugins:netbox_acls:aclinterfaceassignment_add",
-        title="Add",
-        icon_class="mdi mdi-plus-thick",
-        color=ButtonColorChoices.GREEN,
-        permissions=["netbox_acls.add_aclinterfaceassignment"],
-    ),
-]
-
-#
-# Define navigation bar links including the above buttons defined.
-#
-
-menu_items = (
-    PluginMenuItem(
-        link="plugins:netbox_acls:accesslist_list",
-        link_text="Access Lists",
-        buttons=accesslist_buttons,
-        permissions=["netbox_acls.view_accesslist"],
-    ),
-    # Comment out Standard Access List rule to force creation in the ACL view
-    PluginMenuItem(
-        link="plugins:netbox_acls:aclstandardrule_list",
-        link_text="ACL Standard Rules",
-        buttons=aclstandardrule_butons,
-        permissions=["netbox_acls.view_aclstandardrule"],
-    ),
-    # Comment out Extended Access List rule to force creation in the ACL view
-    PluginMenuItem(
-        link="plugins:netbox_acls:aclextendedrule_list",
-        link_text="ACL Extended Rules",
-        buttons=aclextendedrule_butons,
-        permissions=["netbox_acls.view_aclextendedrule"],
-    ),
-    PluginMenuItem(
-        link="plugins:netbox_acls:aclinterfaceassignment_list",
-        link_text="ACL Interface Assignments",
-        buttons=accesslistassignment_buttons,
-        permissions=["netbox_acls.view_aclinterfaceassignment"],
+menu = PluginMenu(
+    label="Access Lists",
+    groups=(
+        (
+            "ACLs",
+            (
+                PluginMenuItem(
+                    link="plugins:netbox_acls:accesslist_list",
+                    link_text="Access Lists",
+                    permissions=["netbox_acls.view_accesslist"],
+                    buttons=(
+                        PluginMenuButton(
+                            link="plugins:netbox_acls:accesslist_add",
+                            title="Add",
+                            icon_class="mdi mdi-plus-thick",
+                            color=ButtonColorChoices.GREEN,
+                            permissions=["netbox_acls.add_accesslist"],
+                        ),
+                    ),
+                ),
+                PluginMenuItem(
+                    link="plugins:netbox_acls:aclstandardrule_list",
+                    link_text="Standard Rules",
+                    permissions=["netbox_acls.view_aclstandardrule"],
+                    buttons=(
+                        PluginMenuButton(
+                            link="plugins:netbox_acls:aclstandardrule_add",
+                            title="Add",
+                            icon_class="mdi mdi-plus-thick",
+                            color=ButtonColorChoices.GREEN,
+                            permissions=["netbox_acls.add_aclstandardrule"],
+                        ),
+                    ),
+                ),
+                PluginMenuItem(
+                    link="plugins:netbox_acls:aclextendedrule_list",
+                    link_text="Extended Rules",
+                    permissions=["netbox_acls.view_aclextendedrule"],
+                    buttons=(
+                        PluginMenuButton(
+                            link="plugins:netbox_acls:aclextendedrule_add",
+                            title="Add",
+                            icon_class="mdi mdi-plus-thick",
+                            color=ButtonColorChoices.GREEN,
+                            permissions=["netbox_acls.add_aclextendedrule"],
+                        ),
+                    ),
+                ),
+                PluginMenuItem(
+                    link="plugins:netbox_acls:aclinterfaceassignment_list",
+                    link_text="Interface Assignments",
+                    permissions=["netbox_acls.view_aclinterfaceassignment"],
+                    buttons=(
+                        PluginMenuButton(
+                            link="plugins:netbox_acls:aclinterfaceassignment_add",
+                            title="Add",
+                            icon_class="mdi mdi-plus-thick",
+                            color=ButtonColorChoices.GREEN,
+                            permissions=["netbox_acls.add_aclinterfaceassignment"],
+                        ),
+                    ),
+                ),
+            ),
+        ),
     ),
+    icon_class="mdi mdi-lock",
 )