From e8b700db356209013df34b2c86b484d8fc4fec1a Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 09:58:18 -0400 Subject: [PATCH 1/8] Remove license parameter --- README.md | 1 - netbox_access_lists/__init__.py | 1 - setup.py | 2 -- 3 files changed, 4 deletions(-) diff --git a/README.md b/README.md index fd35d4a..dd8e58b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ ## netbox-access-lists Manage simple access control lists in NetBox - diff --git a/netbox_access_lists/__init__.py b/netbox_access_lists/__init__.py index 13ea8fe..3d9dc1c 100644 --- a/netbox_access_lists/__init__.py +++ b/netbox_access_lists/__init__.py @@ -10,4 +10,3 @@ class NetBoxAccessListsConfig(PluginConfig): config = NetBoxAccessListsConfig - diff --git a/setup.py b/setup.py index 283b53e..671c7fd 100644 --- a/setup.py +++ b/setup.py @@ -4,10 +4,8 @@ setup( name='netbox-access-lists', version='0.1', description='An example NetBox plugin', - license='Apache 2.0', install_requires=[], packages=find_packages(), include_package_data=True, zip_safe=False, ) - From 1b87589688f1bf4f851ce7157d0efc256c5e6210 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 11:08:05 -0400 Subject: [PATCH 2/8] PEP8 cleanup --- netbox_access_lists/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_access_lists/models.py b/netbox_access_lists/models.py index 4bd64c4..057f4f9 100644 --- a/netbox_access_lists/models.py +++ b/netbox_access_lists/models.py @@ -42,6 +42,7 @@ class AccessList(NetBoxModel): def __str__(self): return self.name + class AccessListRule(NetBoxModel): access_list = models.ForeignKey( to=AccessList, @@ -93,4 +94,3 @@ class AccessListRule(NetBoxModel): def __str__(self): return f'{self.access_list}: Rule {self.index}' - From e66fcde806aa7f6abaca94f846f21d2a9839e2a5 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 11:32:40 -0400 Subject: [PATCH 3/8] Whitespace cleanup --- netbox_access_lists/tables.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox_access_lists/tables.py b/netbox_access_lists/tables.py index 8d5f695..cd0bbc2 100644 --- a/netbox_access_lists/tables.py +++ b/netbox_access_lists/tables.py @@ -34,4 +34,3 @@ class AccessListRuleTable(NetBoxTable): 'access_list', 'index', 'source_prefix', 'source_ports', 'destination_prefix', 'destination_ports', 'protocol', 'action', 'actions', ) - From e7986944e479309e8de364fac21ee2189457ba31 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 11:39:36 -0400 Subject: [PATCH 4/8] Whitespace cleanup --- netbox_access_lists/forms.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox_access_lists/forms.py b/netbox_access_lists/forms.py index de12d0d..53d293f 100644 --- a/netbox_access_lists/forms.py +++ b/netbox_access_lists/forms.py @@ -29,4 +29,3 @@ class AccessListRuleForm(NetBoxModelForm): 'access_list', 'index', 'description', 'source_prefix', 'source_ports', 'destination_prefix', 'destination_ports', 'protocol', 'action', 'tags', ) - From 7b8819f4654a5208b19a15b3b2df4cf189ce6625 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 12:09:00 -0400 Subject: [PATCH 5/8] Cleanup --- netbox_access_lists/urls.py | 1 - netbox_access_lists/views.py | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/netbox_access_lists/urls.py b/netbox_access_lists/urls.py index c74b02c..6451342 100644 --- a/netbox_access_lists/urls.py +++ b/netbox_access_lists/urls.py @@ -27,4 +27,3 @@ urlpatterns = ( }), ) - diff --git a/netbox_access_lists/views.py b/netbox_access_lists/views.py index 0f7f134..62180f4 100644 --- a/netbox_access_lists/views.py +++ b/netbox_access_lists/views.py @@ -5,7 +5,7 @@ from . import forms, models, tables # -# Access lists +# AccessList views # class AccessListView(generic.ObjectView): @@ -29,7 +29,7 @@ class AccessListDeleteView(generic.ObjectDeleteView): # -# Access list rules +# AccessListRule views # class AccessListRuleView(generic.ObjectView): @@ -48,5 +48,3 @@ class AccessListRuleEditView(generic.ObjectEditView): class AccessListRuleDeleteView(generic.ObjectDeleteView): queryset = models.AccessListRule.objects.all() - - From eb599f3257df878f535dead4a13eef299bf82ca9 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 12:56:59 -0400 Subject: [PATCH 6/8] Whitespace cleanup --- netbox_access_lists/navigation.py | 1 - 1 file changed, 1 deletion(-) diff --git a/netbox_access_lists/navigation.py b/netbox_access_lists/navigation.py index 122ee69..b0f7db5 100644 --- a/netbox_access_lists/navigation.py +++ b/netbox_access_lists/navigation.py @@ -32,4 +32,3 @@ menu_items = ( buttons=accesslistrule_butons ), ) - From 013594fda7ed714535a539ba672d9fa31b5c987d Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 13:15:03 -0400 Subject: [PATCH 7/8] Cleanup --- netbox_access_lists/filtersets.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/netbox_access_lists/filtersets.py b/netbox_access_lists/filtersets.py index 0a8a524..d7645ab 100644 --- a/netbox_access_lists/filtersets.py +++ b/netbox_access_lists/filtersets.py @@ -1,5 +1,3 @@ -import django_filters - from netbox.filtersets import NetBoxModelFilterSet from .models import AccessListRule @@ -12,4 +10,3 @@ class AccessListRuleFilterSet(NetBoxModelFilterSet): def search(self, queryset, name, value): return queryset.filter(description__icontains=value) - From f6bde38faf69e09c3a0c9e9d32080c83e96aad75 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Thu, 17 Mar 2022 14:14:39 -0400 Subject: [PATCH 8/8] Cleanup --- netbox_access_lists/api/serializers.py | 16 +++++++++++----- netbox_access_lists/api/urls.py | 1 - netbox_access_lists/api/views.py | 1 - 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/netbox_access_lists/api/serializers.py b/netbox_access_lists/api/serializers.py index 391019f..00c509e 100644 --- a/netbox_access_lists/api/serializers.py +++ b/netbox_access_lists/api/serializers.py @@ -10,7 +10,9 @@ from ..models import AccessList, AccessListRule # class NestedAccessListSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_access_lists-api:accesslist-detail') + url = serializers.HyperlinkedIdentityField( + view_name='plugins-api:netbox_access_lists-api:accesslist-detail' + ) class Meta: model = AccessList @@ -18,7 +20,9 @@ class NestedAccessListSerializer(WritableNestedSerializer): class NestedAccessListRuleSerializer(WritableNestedSerializer): - url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_access_lists-api:accesslistrule-detail') + url = serializers.HyperlinkedIdentityField( + view_name='plugins-api:netbox_access_lists-api:accesslistrule-detail' + ) class Meta: model = AccessListRule @@ -44,7 +48,9 @@ class AccessListSerializer(NetBoxModelSerializer): class AccessListRuleSerializer(NetBoxModelSerializer): - url = serializers.HyperlinkedIdentityField(view_name='plugins-api:netbox_access_lists-api:accesslistrule-detail') + url = serializers.HyperlinkedIdentityField( + view_name='plugins-api:netbox_access_lists-api:accesslistrule-detail' + ) access_list = NestedAccessListSerializer() source_prefix = NestedPrefixSerializer() destination_prefix = NestedPrefixSerializer() @@ -53,6 +59,6 @@ class AccessListRuleSerializer(NetBoxModelSerializer): model = AccessListRule fields = ( 'id', 'url', 'display', 'access_list', 'index', 'protocol', 'source_prefix', 'source_ports', - 'destination_prefix', 'destination_ports', 'action', 'tags', 'custom_fields', 'created', 'last_updated', + 'destination_prefix', 'destination_ports', 'action', 'tags', 'custom_fields', 'created', + 'last_updated', ) - diff --git a/netbox_access_lists/api/urls.py b/netbox_access_lists/api/urls.py index 3906e8d..7afe0a2 100644 --- a/netbox_access_lists/api/urls.py +++ b/netbox_access_lists/api/urls.py @@ -9,4 +9,3 @@ router.register('access-lists', views.AccessListViewSet) router.register('access-list-rules', views.AccessListRuleViewSet) urlpatterns = router.urls - diff --git a/netbox_access_lists/api/views.py b/netbox_access_lists/api/views.py index db33cfa..b6112c9 100644 --- a/netbox_access_lists/api/views.py +++ b/netbox_access_lists/api/views.py @@ -19,4 +19,3 @@ class AccessListRuleViewSet(NetBoxModelViewSet): ) serializer_class = AccessListRuleSerializer filterset_class = filtersets.AccessListRuleFilterSet -