NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 17:38:37 -06:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

#8293: Tweak table column output & add changelog

Browse Source
This commit is contained in:
jeremystretch 2022-01-13 15:10:06 -05:00
parent aa77f8f0d2
commit 0ca6d73614
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-3.1.md
View File

@ -7,6 +7,7 @@
* [#8246](https://github.com/netbox-community/netbox/issues/8246) - Show human-friendly values for commit rates in circuits table * [#8246](https://github.com/netbox-community/netbox/issues/8246) - Show human-friendly values for commit rates in circuits table
* [#8262](https://github.com/netbox-community/netbox/issues/8262) - Add cable count to tenant stats * [#8262](https://github.com/netbox-community/netbox/issues/8262) - Add cable count to tenant stats
* [#8265](https://github.com/netbox-community/netbox/issues/8265) - Add Stackwise-n interface types * [#8265](https://github.com/netbox-community/netbox/issues/8265) - Add Stackwise-n interface types
* [#8293](https://github.com/netbox-community/netbox/issues/8293) - Show 4-byte ASNs in ASDOT notation
* [#8302](https://github.com/netbox-community/netbox/issues/8302) - Linkify role column in device & VM tables * [#8302](https://github.com/netbox-community/netbox/issues/8302) - Linkify role column in device & VM tables
### Bug Fixes ### Bug Fixes

13
netbox/ipam/models/ip.py
View File

@ -130,9 +130,20 @@ class ASN(PrimaryModel):
def get_absolute_url(self): def get_absolute_url(self):
return reverse('ipam:asn', args=[self.pk]) return reverse('ipam:asn', args=[self.pk])
@property
def asn_asdot(self):
"""
Return ASDOT notation for AS numbers greater than 16 bits.
"""
if self.asn > 65535:
return f'{self.asn // 65536}.{self.asn % 65536}'
return self.asn
@property @property
def asn_with_asdot(self): def asn_with_asdot(self):
# Return asn with asdot notation for an ASN larger than 65535 otherwise return the plain ASN """
Return both plain and ASDOT notation, where applicable.
"""
if self.asn > 65535: if self.asn > 65535:
return f'{self.asn} ({self.asn // 65536}.{self.asn % 65536})' return f'{self.asn} ({self.asn // 65536}.{self.asn % 65536})'
else: else:

4
netbox/ipam/tables/ip.py
View File

@ -104,12 +104,10 @@ class RIRTable(BaseTable):
class ASNTable(BaseTable): class ASNTable(BaseTable):
pk = ToggleColumn() pk = ToggleColumn()
asn = tables.Column( asn = tables.Column(
accessor=tables.A('asn_asdot'),
linkify=True linkify=True
) )
def render_asn(self, value, record):
return record.asn_with_asdot
site_count = LinkedCountColumn( site_count = LinkedCountColumn(
viewname='dcim:site_list', viewname='dcim:site_list',
url_params={'asn_id': 'pk'}, url_params={'asn_id': 'pk'},