mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #3435: Change IP/prefix CSV export to reference VRF name instead of RD

Browse Source
This commit is contained in:
Jeremy Stretch
2019-09-25 09:39:03 -04:00
parent b8d8cb33ff
commit 86cef1c502
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ v2.6.5 (FUTURE)
## Bug Fixes ## 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 * [#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 * [#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 * [#3521](https://github.com/netbox-community/netbox/issues/3521) - Fix error in `parseURL` related to variables in API URL

4
netbox/ipam/models.py
View File

@ -382,7 +382,7 @@ class Prefix(ChangeLoggedModel, CustomFieldModel):
def to_csv(self): def to_csv(self):
return ( return (
self.prefix, 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.tenant.name if self.tenant else None,
self.site.name if self.site else None, self.site.name if self.site else None,
self.vlan.group.name if self.vlan and self.vlan.group else None, self.vlan.group.name if self.vlan and self.vlan.group else None,
@ -674,7 +674,7 @@ class IPAddress(ChangeLoggedModel, CustomFieldModel):
return ( return (
self.address, 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.tenant.name if self.tenant else None,
self.get_status_display(), self.get_status_display(),
self.get_role_display(), self.get_role_display(),