Merge branch 'step09-rest-api' into step10-graphql

README.md

@@ -1,4 +1,3 @@
 ## netbox-access-lists
 
 Manage simple access control lists in NetBox
-

netbox_access_lists/__init__.py

@@ -10,4 +10,3 @@ class NetBoxAccessListsConfig(PluginConfig):
 
 
 config = NetBoxAccessListsConfig
-

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',
         )
-

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
-

netbox_access_lists/api/views.py

@@ -19,4 +19,3 @@ class AccessListRuleViewSet(NetBoxModelViewSet):
     )
     serializer_class = AccessListRuleSerializer
     filterset_class = filtersets.AccessListRuleFilterSet
-

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)
-

netbox_access_lists/forms.py

@@ -50,4 +50,3 @@ class AccessListRuleFilterForm(NetBoxModelFilterSetForm):
         choices=ActionChoices,
         required=False
     )
-

netbox_access_lists/models.py

@@ -101,4 +101,3 @@ class AccessListRule(NetBoxModel):
 
     def get_absolute_url(self):
         return reverse('plugins:netbox_access_lists:accesslistrule', args=[self.pk])
-

netbox_access_lists/navigation.py

@@ -32,4 +32,3 @@ menu_items = (
         buttons=accesslistrule_butons
     ),
 )
-

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',
         )
-

netbox_access_lists/urls.py

@@ -27,4 +27,3 @@ urlpatterns = (
     }),
 
 )
-

netbox_access_lists/views.py

@@ -5,7 +5,7 @@ from . import filtersets, forms, models, tables
 
 
 #
-# Access lists
+# AccessList views
 #
 
 class AccessListView(generic.ObjectView):
@@ -37,7 +37,7 @@ class AccessListDeleteView(generic.ObjectDeleteView):
 
 
 #
-# Access list rules
+# AccessListRule views
 #
 
 class AccessListRuleView(generic.ObjectView):
@@ -58,4 +58,3 @@ class AccessListRuleEditView(generic.ObjectEditView):
 
 class AccessListRuleDeleteView(generic.ObjectDeleteView):
     queryset = models.AccessListRule.objects.all()
-

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,
 )
-