Fixes #7880: Include assigned IP addresses in FHRP group object representation

Author: jeremystretch

docs/release-notes/version-3.1.md

@@ -24,6 +24,7 @@
 * [#7768](https://github.com/netbox-community/netbox/issues/7768) - Validate IP address status when creating a new FHRP group
 * [#7771](https://github.com/netbox-community/netbox/issues/7771) - Group assignment should be optional when creating contacts via REST API
 * [#7849](https://github.com/netbox-community/netbox/issues/7849) - Fix exception when creating an FHRPGroup with an invalid IP address
+* [#7880](https://github.com/netbox-community/netbox/issues/7880) - Include assigned IP addresses in FHRP group object representation
 
 ### REST API Changes
 

netbox/dcim/tables/template_code.py

@@ -53,7 +53,7 @@
 INTERFACE_FHRPGROUPS = """
 <div class="table-badge-group">
   {% for assignment in value.all %}
-    <a href="{{ assignment.group.get_absolute_url }}">{{ assignment.group.group_id }} ({{ assignment.group.get_protocol_display }})</a>
+    <a href="{{ assignment.group.get_absolute_url }}">{{ assignment.group.get_protocol_display }}: {{ assignment.group.group_id }}</a>
   {% endfor %}
 </div>
 """

netbox/ipam/api/views.py

@@ -138,6 +138,7 @@ class FHRPGroupViewSet(CustomFieldModelViewSet):
     queryset = FHRPGroup.objects.prefetch_related('ip_addresses', 'tags')
     serializer_class = serializers.FHRPGroupSerializer
     filterset_class = filtersets.FHRPGroupFilterSet
+    brief_prefetch_fields = ('ip_addresses',)
 
 
 class FHRPGroupAssignmentViewSet(CustomFieldModelViewSet):

netbox/ipam/models/fhrp.py

@@ -56,7 +56,17 @@ class Meta:
         verbose_name = 'FHRP group'
 
     def __str__(self):
-        return f'{self.get_protocol_display()} group {self.group_id}'
+        name = f'{self.get_protocol_display()}: {self.group_id}'
+
+        # Append the list of assigned IP addresses to serve as an additional identifier
+        if self.pk:
+            ip_addresses = [
+                str(ip.address) for ip in self.ip_addresses.all()
+            ]
+            if ip_addresses:
+                return f"{name} ({', '.join(ip_addresses)})"
+
+        return name
 
     def get_absolute_url(self):
         return reverse('ipam:fhrpgroup', args=[self.pk])

netbox/templates/ipam/fhrpgroup.html

@@ -3,6 +3,9 @@
 {% load plugins %}
 {% load render_table from django_tables2 %}
 
+{# Omit assigned IP addresses from object representation #}
+{% block title %}{{ object.get_protocol_display }}: {{ object.group_id }}{% endblock %}
+
 {% block breadcrumbs %}
   {{ block.super }}
   <li class="breadcrumb-item"><a href="{% url 'ipam:fhrpgroup_list' %}?protocol={{ object.protocol }}">{{ object.get_protocol_display }}</a></li>