diff --git a/netbox/ipam/api/serializers.py b/netbox/ipam/api/serializers.py index f4493719f..8a618fcb1 100644 --- a/netbox/ipam/api/serializers.py +++ b/netbox/ipam/api/serializers.py @@ -22,7 +22,7 @@ class VRFSerializer(CustomFieldModelSerializer): class Meta: model = VRF - fields = ['id', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'custom_fields'] + fields = ['id', 'name', 'rd', 'tenant', 'enforce_unique', 'description', 'display_name', 'custom_fields'] class NestedVRFSerializer(serializers.ModelSerializer): diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 89ee0facc..d3ed9addd 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -97,7 +97,7 @@ class VRF(CreatedUpdatedModel, CustomFieldModel): verbose_name_plural = 'VRFs' def __str__(self): - return self.name + return self.display_name or super(VRF, self).__str__() def get_absolute_url(self): return reverse('ipam:vrf', args=[self.pk]) @@ -111,6 +111,12 @@ class VRF(CreatedUpdatedModel, CustomFieldModel): self.description, ]) + @property + def display_name(self): + if self.name and self.rd: + return "{} ({})".format(self.name, self.rd) + return None + @python_2_unicode_compatible class RIR(models.Model):