Cleanup

Author: menckend

.flake8.purge

@@ -1,2 +1,2 @@
 [flake8]
-max-line-length = 120
+max-line-length = 180

netbox-plugin.yaml

@@ -1,4 +1,4 @@
-version: 0.0.3.5
+version: 0.0.3.5.8
 package_name: netbox_rpki
 compatibility:
 - release: 0.0.2.21

netbox_rpki/__init__.py

@@ -1,7 +1,6 @@
 from netbox.plugins import PluginConfig
 from netbox_rpki.version import __version__
 
-# import api
 
 class RpkiConfig(PluginConfig):
     name = 'netbox_rpki'
@@ -18,4 +17,5 @@ class RpkiConfig(PluginConfig):
         'top_level_menu': True
         }
 
+
 config = RpkiConfig

netbox_rpki/choices.py

@@ -9,8 +9,7 @@ class CertificateStatusChoices(ChoiceSet):
     STATUS_REVOKED = 'revoked'
 
     CHOICES = [
-        (STATUS_ACTIVE, 'Active', 'blue'),
-        (STATUS_RESERVED, 'Reserved', 'cyan'),
-        (STATUS_DEPRECATED, 'Deprecated', 'red'),
+        (STATUS_VALID, 'valid', 'blue'),
+        (STATUS_PLANNED, 'planned', 'cyan'),
+        (STATUS_REVOKED, 'revoked', 'red'),
     ]
-

netbox_rpki/filtersets.py

@@ -20,6 +20,7 @@ def search(self, queryset, name, value):
         )
         return queryset.filter(qs_filter)
 
+
 class OrganizationFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
     class Meta:
         model = netbox_rpki.models.Organization
@@ -35,6 +36,7 @@ def search(self, queryset, name, value):
         )
         return queryset.filter(qs_filter)
 
+
 class RoaFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
     class Meta:
         model = netbox_rpki.models.Roa
@@ -50,6 +52,7 @@ def search(self, queryset, name, value):
         )
         return queryset.filter(qs_filter)
 
+
 class RoaPrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
     class Meta:
         model = netbox_rpki.models.RoaPrefix
@@ -81,6 +84,7 @@ def search(self, queryset, name, value):
         )
         return queryset.filter(qs_filter)
 
+
 class CertificateAsnFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
     class Meta:
         model = netbox_rpki.models.CertificateAsn
@@ -96,3 +100,5 @@ def search(self, queryset, name, value):
         )
         return queryset.filter(qs_filter)
 
+#    def search(self, queryset, name, value):
+#        """Perform the filtered search."""

netbox_rpki/forms.py

@@ -57,7 +57,7 @@ class CertificateFilterForm(NetBoxModelFilterSetForm):
 class OrganizationForm(NetBoxModelForm):
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     comments = CommentField()
-    
+
     class Meta:
         model = Organization
         fields = ['org_id', 'name', 'parent_rir', 'ext_url', 'tenant', 'comments', 'tags']
@@ -66,6 +66,7 @@ class Meta:
 class RoaForm(NetBoxModelForm):
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     comments = CommentField()
+
     class Meta:
         model = Roa
         fields: list[str] = ['name', 'origin_as', 'valid_from', 'valid_to', "auto_renews", 'signed_by', 'tenant', 'comments', 'tags']
@@ -74,6 +75,7 @@ class Meta:
 class RoaPrefixForm(NetBoxModelForm):
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     comments = CommentField()
+
     class Meta:
         model = RoaPrefix
         fields = ['prefix', 'max_length', 'roa_name', 'tenant', 'comments', 'tags']
@@ -82,13 +84,15 @@ class Meta:
 class CertificatePrefixForm(NetBoxModelForm):
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     comments = CommentField()
+
     class Meta:
         model = CertificatePrefix
         fields = ['prefix', 'certificate_name', 'tenant', 'comments', 'tags']
 
 class CertificateAsnForm(NetBoxModelForm):
     tenant = DynamicModelChoiceField(queryset=Tenant.objects.all(), required=False)
     comments = CommentField()
+
     class Meta:
         model = CertificateAsn
         fields = ['asn', 'certificate_name2', 'tenant', 'comments', 'tags']

netbox_rpki/navigation.py

@@ -3,11 +3,6 @@
 from netbox.plugins.utils import get_plugin_config
 
 
-from django.conf import settings
-
-from netbox.plugins import PluginMenuButton, PluginMenuItem, PluginMenu
-
-
 resource_menu_items = (
     PluginMenuItem(
         link='plugins:netbox_rpki:organization_list',

netbox_rpki/tables.py

@@ -1,7 +1,7 @@
 
 import django_tables2 as tables
 from django.utils.safestring import mark_safe
-from django_tables2.utils import A
+# from django_tables2.utils import A
 
 from netbox.tables import NetBoxTable
 from netbox.tables.columns import ChoiceFieldColumn, TagColumn
@@ -25,6 +25,7 @@ class CertificateTable(NetBoxTable):
     tags = TagColumn(
         url_name='plugins:netbox_rpki:certificate_list'
     )
+
     class Meta(NetBoxTable.Meta):
         model = netbox_rpki.models.Certificate
         fields = ("pk", "id", "name", "issuer", "subject", "serial", "valid_from", "valid_to", "auto_renews", "publicKey", "private_key", "publication_url", "ca_repository", "self_hosted", "rpki_org", "comments", "tenant", "tags")
@@ -43,7 +44,7 @@ class OrganizationTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = netbox_rpki.models.Organization
         fields = ("pk", "id", "org_id", "name", "parent_rir", "ext_url", "comments", "tenant", "tags")
-        default_columns = ("org_id", "name","parent_rir", "ext_url", "comments", "tenant", "tags")
+        default_columns = ("org_id", "name", "parent_rir", "ext_url", "comments", "tenant", "tags")
 
 
 class RoaTable(NetBoxTable):
@@ -104,4 +105,3 @@ class Meta(NetBoxTable.Meta):
         model = netbox_rpki.models.CertificateAsn
         fields = ("pk", "id", "asn", "certificate_name2", "comments", "tenant", "tags")
         default_columns = ("asn", "comments", "tenant", "tags")
-