Преглед на файлове

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

Jeremy Stretch преди 6 години
родител
ревизия
86cef1c502
променени са 2 файла, в които са добавени 3 реда и са изтрити 2 реда
  1. 1 0
      CHANGELOG.md
  2. 2 2
      netbox/ipam/models.py

+ 1 - 0
CHANGELOG.md

@@ -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

+ 2 - 2
netbox/ipam/models.py

@@ -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(),