Add relationship from ASN to ASNRange

netbox/ipam/api/serializers.py

@@ -38,6 +38,7 @@ class ASNRangeSerializer(NetBoxModelSerializer):
 
 class ASNSerializer(NetBoxModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='ipam-api:asn-detail')
+    range = NestedASNRangeSerializer(required=False, allow_null=True)
     tenant = NestedTenantSerializer(required=False, allow_null=True)
     site_count = serializers.IntegerField(read_only=True)
     provider_count = serializers.IntegerField(read_only=True)
@@ -45,7 +46,7 @@ class ASNSerializer(NetBoxModelSerializer):
     class Meta:
         model = ASN
         fields = [
-            'id', 'url', 'display', 'asn', 'rir', 'tenant', 'description', 'comments', 'tags', 'custom_fields',
+            'id', 'url', 'display', 'asn', 'rir', 'range', 'tenant', 'description', 'comments', 'tags', 'custom_fields',
             'created', 'last_updated', 'site_count', 'provider_count',
         ]
 

netbox/ipam/filtersets.py

@@ -192,6 +192,16 @@ class ASNFilterSet(OrganizationalModelFilterSet, TenancyFilterSet):
         to_field_name='slug',
         label=_('RIR (slug)'),
     )
+    range_id = django_filters.ModelMultipleChoiceFilter(
+        queryset=ASNRange.objects.all(),
+        label=_('Range (ID)'),
+    )
+    range = django_filters.ModelMultipleChoiceFilter(
+        field_name='range__slug',
+        queryset=ASNRange.objects.all(),
+        to_field_name='slug',
+        label=_('Range (slug)'),
+    )
     site_id = django_filters.ModelMultipleChoiceFilter(
         field_name='sites',
         queryset=Site.objects.all(),

netbox/ipam/forms/bulk_edit.py

@@ -125,6 +125,10 @@ class ASNBulkEditForm(NetBoxModelBulkEditForm):
         required=False,
         label=_('RIR')
     )
+    range = DynamicModelChoiceField(
+        queryset=ASNRange.objects.all(),
+        required=False
+    )
     tenant = DynamicModelChoiceField(
         queryset=Tenant.objects.all(),
         required=False
@@ -140,9 +144,9 @@ class ASNBulkEditForm(NetBoxModelBulkEditForm):
 
     model = ASN
     fieldsets = (
-        (None, ('sites', 'rir', 'tenant', 'description')),
+        (None, ('sites', 'rir', 'range', 'tenant', 'description')),
     )
-    nullable_fields = ('date_added', 'description', 'comments')
+    nullable_fields = ('range', 'description', 'comments')
 
 
 class AggregateBulkEditForm(NetBoxModelBulkEditForm):

netbox/ipam/forms/bulk_import.py

@@ -107,6 +107,11 @@ class ASNImportForm(NetBoxModelImportForm):
         to_field_name='name',
         help_text=_('Assigned RIR')
     )
+    range = CSVModelChoiceField(
+        queryset=ASNRange.objects.all(),
+        to_field_name='name',
+        help_text=_('ASN range')
+    )
     tenant = CSVModelChoiceField(
         queryset=Tenant.objects.all(),
         required=False,
@@ -116,7 +121,7 @@ class ASNImportForm(NetBoxModelImportForm):
 
     class Meta:
         model = ASN
-        fields = ('asn', 'rir', 'tenant', 'description', 'comments', 'tags')
+        fields = ('asn', 'rir', 'range', 'tenant', 'description', 'comments', 'tags')
 
 
 class RoleImportForm(NetBoxModelImportForm):

netbox/ipam/forms/filtersets.py

@@ -135,7 +135,7 @@ class ASNFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
     model = ASN
     fieldsets = (
         (None, ('q', 'filter_id', 'tag')),
-        ('Assignment', ('rir_id', 'site_id')),
+        ('Assignment', ('rir_id', 'range_id', 'site_id')),
         ('Tenant', ('tenant_group_id', 'tenant_id')),
     )
     rir_id = DynamicModelMultipleChoiceField(
@@ -143,6 +143,11 @@ class ASNFilterForm(TenancyFilterForm, NetBoxModelFilterSetForm):
         required=False,
         label=_('RIR')
     )
+    range_id = DynamicModelMultipleChoiceField(
+        queryset=ASNRange.objects.all(),
+        required=False,
+        label=_('Range')
+    )
     site_id = DynamicModelMultipleChoiceField(
         queryset=Site.objects.all(),
         required=False,

netbox/ipam/models/asns.py

@@ -106,7 +106,7 @@ class ASNRange(OrganizationalModel):
         verbose_name_plural = 'ASN ranges'
 
     def __str__(self):
-        return f'ASNs {self.range_as_string()}'
+        return f'{self.name} ({self.range_as_string()})'
 
     def get_absolute_url(self):
         return reverse('ipam:asnrange', args=[self.pk])

netbox/ipam/tables/asn.py

@@ -37,6 +37,12 @@ class ASNTable(TenancyColumnsMixin, NetBoxTable):
     asn = tables.Column(
         linkify=True
     )
+    rir = tables.Column(
+        linkify=True
+    )
+    range = tables.Column(
+        linkify=True
+    )
     asn_asdot = tables.Column(
         accessor=tables.A('asn_asdot'),
         linkify=True,
@@ -63,7 +69,9 @@ class ASNTable(TenancyColumnsMixin, NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = ASN
         fields = (
-            'pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'provider_count', 'tenant', 'tenant_group', 'description',
+            'pk', 'asn', 'asn_asdot', 'rir', 'range', 'site_count', 'provider_count', 'tenant', 'tenant_group',
-            'comments', 'sites', 'tags', 'created', 'last_updated', 'actions',
+            'description', 'comments', 'sites', 'tags', 'created', 'last_updated', 'actions',
+        )
+        default_columns = (
+            'pk', 'asn', 'rir', 'range', 'site_count', 'provider_count', 'sites', 'description', 'tenant',
         )
-        default_columns = ('pk', 'asn', 'rir', 'site_count', 'provider_count', 'sites', 'description', 'tenant')

netbox/ipam/views.py

@@ -213,7 +213,7 @@ class ASNRangeView(generic.ObjectView):
 
     def get_extra_context(self, request, instance):
         related_models = (
-            (ASN.objects.restrict(request.user, 'view').filter(range=instance), 'asn_id'),
+            (ASN.objects.restrict(request.user, 'view').filter(range=instance), 'range_id'),
         )
 
         return {

netbox/templates/ipam/asn.html

@@ -7,6 +7,9 @@
 {% block breadcrumbs %}
   {{ block.super }}
   <li class="breadcrumb-item"><a href="{% url 'ipam:asn_list' %}?rir_id={{ object.rir.pk }}">{{ object.rir }}</a></li>
+  {% if object.range %}
+    <li class="breadcrumb-item"><a href="{% url 'ipam:asn_list' %}?range_id={{ object.range.pk }}">{{ object.range }}</a></li>
+  {% endif %}
 {% endblock breadcrumbs %}
 
 {% block content %}
@@ -26,6 +29,10 @@
                 <a href="{% url 'ipam:asn_list' %}?rir={{ object.rir.slug }}">{{ object.rir }}</a>
               </td>
             </tr>
+            <tr>
+              <td>Range</td>
+              <td>{{ object.range|linkify|placeholder }}</td>
+            </tr>
             <tr>
               <td>Tenant</td>
               <td>

netbox/templates/ipam/asnrange.html

@@ -46,6 +46,13 @@
   </div>
   <div class="row">
     <div class="col col-md-12">
+      <div class="card">
+        <h5 class="card-header">ASNs</h5>
+        <div class="card-body htmx-container table-responsive"
+          hx-get="{% url 'ipam:asn_list' %}?range_id={{ object.pk }}"
+          hx-trigger="load"
+        ></div>
+      </div>
       {% plugin_full_width_page object %}
     </div>
   </div>