Merge pull request #264 from cruse1977/develop

Fixes for NetBox 4.3

Author: cruse1977

netbox_bgp/forms.py

@@ -352,11 +352,13 @@ class BGPSessionImportForm(NetBoxModelImportForm):
         queryset=Device.objects.all(),
         to_field_name="name",
         help_text=_("Assigned device"),
+        required=False,
     )
     virtualmachine = CSVModelChoiceField(
         queryset=VirtualMachine.objects.all(),
         to_field_name="name",
         help_text=_("Assigned virtual machine"),
+        required=False,
     )
     status = CSVChoiceField(
         choices=SessionStatusChoices, required=False, help_text=_("Operational status")

netbox_bgp/migrations/0035_alter_aspathlist_options_and_more.py

@@ -0,0 +1,57 @@
+# Generated by Django 5.2.4 on 2025-08-04 19:56
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('netbox_bgp', '0034_aspathlist_routingpolicyrule_match_aspath_list_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='aspathlist',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='aspathlistrule',
+            options={'ordering': ('aspath_list', 'index')},
+        ),
+        migrations.AlterModelOptions(
+            name='bgppeergroup',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='bgpsession',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='community',
+            options={'ordering': ['value']},
+        ),
+        migrations.AlterModelOptions(
+            name='communitylist',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='communitylistrule',
+            options={'ordering': ['community_list', 'community']},
+        ),
+        migrations.AlterModelOptions(
+            name='prefixlist',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='prefixlistrule',
+            options={'ordering': ['prefix_list', 'index']},
+        ),
+        migrations.AlterModelOptions(
+            name='routingpolicy',
+            options={'ordering': ['name']},
+        ),
+        migrations.AlterModelOptions(
+            name='routingpolicyrule',
+            options={'ordering': ['routing_policy', 'index']},
+        ),
+    ]

netbox_bgp/models.py

@@ -27,6 +27,7 @@ class ASPathList(NetBoxModel):
     class Meta:
         verbose_name_plural = 'AS Path Lists'
         unique_together = ['name', 'description']
+        ordering = ['name']
 
     def __str__(self):
         return self.name
@@ -69,6 +70,8 @@ def get_absolute_url(self):
     def get_action_color(self):
         return ActionChoices.colors.get(self.action)
 
+    class Meta:
+        ordering = ['aspath_list', 'index']
 
 
 class RoutingPolicy(NetBoxModel):
@@ -88,6 +91,7 @@ class RoutingPolicy(NetBoxModel):
     class Meta:
         verbose_name_plural = 'Routing Policies'
         unique_together = ['name', 'description']
+        ordering = ['name']
 
     def __str__(self):
         return self.name
@@ -123,6 +127,7 @@ class BGPPeerGroup(NetBoxModel):
     class Meta:
         verbose_name_plural = 'Peer Groups'
         unique_together = ['name', 'description']
+        ordering = ['name']
 
     def __str__(self):
         return self.name
@@ -180,6 +185,7 @@ class Community(BGPBase):
 
     class Meta:
         verbose_name_plural = 'Communities'
+        ordering = ['value']
 
     def __str__(self):
         return self.value
@@ -208,6 +214,7 @@ class CommunityList(NetBoxModel):
     class Meta:
         verbose_name_plural = 'Community Lists'
         unique_together = ['name', 'description']
+        ordering = ['name']
 
     def __str__(self):
         return self.name
@@ -250,6 +257,9 @@ def get_absolute_url(self):
     def get_action_color(self):
         return ActionChoices.colors.get(self.action)
 
+    class Meta:
+        ordering = ['community_list', 'community']
+
 
 class PrefixList(NetBoxModel):
     """
@@ -272,6 +282,7 @@ class PrefixList(NetBoxModel):
     class Meta:
         verbose_name_plural = 'Prefix Lists'
         unique_together = ['name', 'description', 'family']
+        ordering = ['name']
 
     def __str__(self):
         return self.name
@@ -323,8 +334,8 @@ class PrefixListRule(NetBoxModel):
     )
 
     class Meta:
-        ordering = ('prefix_list', 'index')
         unique_together = ('prefix_list', 'index')
+        ordering = ['prefix_list','index']
 
     @property
     def network(self):
@@ -453,7 +464,8 @@ class BGPSession(NetBoxModel):
     class Meta:
         verbose_name_plural = 'BGP Sessions'
         unique_together = [['device', 'local_address', 'local_as', 'remote_address', 'remote_as'], ['virtualmachine', 'local_address', 'local_as', 'remote_address', 'remote_as']]
-    
+        ordering = ['name']
+
     def __str__(self):
         if self.device:
             return f'{self.device}:{self.name}'
@@ -535,8 +547,9 @@ class RoutingPolicyRule(NetBoxModel):
     )    
 
     class Meta:
-        ordering = ('routing_policy', 'index')
+        ordering = ['routing_policy', 'index']
         unique_together = ('routing_policy', 'index')
+        ordering = ['routing_policy', 'index']
 
     def __str__(self):
         return f'{self.routing_policy}: Rule {self.index}'

netbox_bgp/tables.py

@@ -152,7 +152,7 @@ class BGPPeerGroupTable(NetBoxTable):
         orderable=False
     )
     tags = TagColumn(
-        url_name='plugins:netbox_bgp:peer_group_list'
+        url_name='plugins:netbox_bgp:bgppeergroup_list'
     )
 
     class Meta(NetBoxTable.Meta):

netbox_bgp/templates/netbox_bgp/prefixlistrule.html

@@ -1,5 +1,8 @@
 {% extends 'generic/object.html' %}
+{% load buttons %}
+{% load custom_links %}
 {% load helpers %}
+{% load plugins %}
 {% load static %}
 
 {% block content %}

netbox_bgp/templates/netbox_bgp/routingpolicyrule.html

@@ -1,5 +1,8 @@
 {% extends 'generic/object.html' %}
+{% load buttons %}
+{% load custom_links %}
 {% load helpers %}
+{% load plugins %}
 {% load static %}
 
 {% block content %}

netbox_bgp/views.py

@@ -281,7 +281,7 @@ class RoutingPolicyRuleListView(generic.ObjectListView):
     filterset = filtersets.RoutingPolicyRuleFilterSet
     # filterset_form = RoutingPolicyRuleFilterForm
     table = tables.RoutingPolicyRuleTable
-    actions = {'add': {'add'}, 'bulk_delete': {'delete'}}
+    actions = {'add': {'add'}, 'bulk_import': {'add'}, 'export': {'export'}, 'bulk_delete': {'delete'}}
 
 @register_model_view(RoutingPolicyRule, "add", detail=False)
 @register_model_view(RoutingPolicyRule, "edit")
@@ -451,7 +451,7 @@ class PrefixListRuleListView(generic.ObjectListView):
     filterset = filtersets.PrefixListRuleFilterSet
     # filterset_form = RoutingPolicyRuleFilterForm
     table = tables.PrefixListRuleTable
-    actions = {'add': {'add'}, 'bulk_delete': {'delete'}}
+    actions = {'add': {'add'}, 'bulk_import': {'add'}, 'export': {'export'}, 'bulk_delete': {'delete'}}
 
 @register_model_view(PrefixListRule, "add", detail=False)
 @register_model_view(PrefixListRule, "edit")
@@ -558,7 +558,7 @@ class ASPathListRuleListView(generic.ObjectListView):
     filterset = filtersets.ASPathListRuleFilterSet
     # filterset_form = ASPathListRuleFilterForm
     table = tables.ASPathListRuleTable
-    actions = {'add': {'add'}, 'bulk_delete': {'delete'}}
+    actions = {'add': {'add'}, 'bulk_import': {'add'}, 'export': {'export'}, 'bulk_delete': {'delete'}}
 
 
 @register_model_view(ASPathListRule, "add", detail=False)