From 86cef1c50215faab72f34985e46cfa8838c20a10 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 25 Sep 2019 09:39:03 -0400 Subject: [PATCH] Fixes #3435: Change IP/prefix CSV export to reference VRF name instead of RD --- CHANGELOG.md | 1 + netbox/ipam/models.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a6a4be55..1458d60e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ v2.6.5 (FUTURE) ## Bug Fixes +* [#3435](https://github.com/netbox-community/netbox/issues/3435) - Change IP/prefix CSV export to reference VRF name instead of RD * [#3464](https://github.com/netbox-community/netbox/issues/3464) - Fix foreground text color on color picker fields * [#3519](https://github.com/netbox-community/netbox/issues/3519) - Prevent cables from being terminated to virtual/wireless interfaces via API * [#3521](https://github.com/netbox-community/netbox/issues/3521) - Fix error in `parseURL` related to variables in API URL diff --git a/netbox/ipam/models.py b/netbox/ipam/models.py index 5e867e1d6..3304c27dd 100644 --- a/netbox/ipam/models.py +++ b/netbox/ipam/models.py @@ -382,7 +382,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel): def to_csv(self): return ( self.prefix, - self.vrf.rd if self.vrf else None, + self.vrf.name if self.vrf else None, self.tenant.name if self.tenant else None, self.site.name if self.site else None, self.vlan.group.name if self.vlan and self.vlan.group else None, @@ -674,7 +674,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel): return ( self.address, - self.vrf.rd if self.vrf else None, + self.vrf.name if self.vrf else None, self.tenant.name if self.tenant else None, self.get_status_display(), self.get_role_display(),