Skip to content

Commit 5a095ea

Browse files
authored
Merge pull request #278 from pheus/277-add-NetBox-v4-4-support
Closes #277 - Add support for NetBox v4.4
2 parents 1729f95 + 73c93c4 commit 5a095ea

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG NETBOX_VARIANT=v4.3
1+
ARG NETBOX_VARIANT=v4.4
22

33
FROM netboxcommunity/netbox:${NETBOX_VARIANT}
44

netbox_acls/__init__.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,23 @@
22
Define the NetBox Plugin
33
"""
44

5-
from netbox.plugins import PluginConfig
65
import importlib.metadata
76

7+
from netbox.plugins import PluginConfig
8+
9+
810
class NetBoxACLsConfig(PluginConfig):
911
"""
1012
Plugin specifc configuration
1113
"""
1214

1315
name = "netbox_acls"
1416
verbose_name = "Access Lists"
15-
version = importlib.metadata.version('netbox-acls')
17+
version = importlib.metadata.version("netbox-acls")
1618
description = "Manage simple ACLs in NetBox"
1719
base_url = "access-lists"
1820
min_version = "4.3.0"
19-
max_version = "4.3.99"
21+
max_version = "4.4.99"
2022

2123

2224
config = NetBoxACLsConfig

netbox_acls/tests/api/test_access_list_rules.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,13 @@
33
from utilities.testing import APIViewTestCases
44
from virtualization.models import Cluster, ClusterType, VirtualMachine
55

6-
from netbox_acls.choices import *
7-
from netbox_acls.models import *
6+
from netbox_acls.choices import (
7+
ACLActionChoices,
8+
ACLProtocolChoices,
9+
ACLRuleActionChoices,
10+
ACLTypeChoices,
11+
)
12+
from netbox_acls.models import AccessList, ACLExtendedRule, ACLStandardRule
813

914

1015
class ACLStandardRuleAPIViewTestCase(APIViewTestCases.APIViewTestCase):

netbox_acls/tests/api/test_access_lists.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
from utilities.testing import APIViewTestCases
55
from virtualization.models import Cluster, ClusterType, VirtualMachine, VMInterface
66

7-
from netbox_acls.choices import *
8-
from netbox_acls.models import *
7+
from netbox_acls.choices import (
8+
ACLActionChoices,
9+
ACLAssignmentDirectionChoices,
10+
ACLTypeChoices,
11+
)
12+
from netbox_acls.models import AccessList, ACLInterfaceAssignment
913

1014

1115
class AccessListAPIViewTestCase(APIViewTestCases.APIViewTestCase):
@@ -116,7 +120,7 @@ def setUpTestData(cls):
116120
},
117121
]
118122
cls.bulk_update_data = {
119-
"default_action": ACLActionChoices.ACTION_PERMIT,
123+
"comments": "Rule bulk update",
120124
}
121125

122126

0 commit comments

Comments
 (0)