NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-20 12:22:23 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge v3.1.9

Browse Source
This commit is contained in:
jeremystretch
2022-03-07 10:55:30 -05:00
parent a740203444 1fdc7a9163
commit cd29293dd6
19 changed files with 217 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/ipam/tables/fhrp.py
View File

@@ -26,8 +26,8 @@ class FHRPGroupTable(NetBoxTable):
orderable=False,
verbose_name='IP Addresses'
)
interface_count = tables.Column(
verbose_name='Interfaces'
member_count = tables.Column(
verbose_name='Members'
)
tags = columns.TagColumn(
url_name='ipam:fhrpgroup_list'
@@ -36,10 +36,10 @@ class FHRPGroupTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = FHRPGroup
fields = (
'pk', 'group_id', 'protocol', 'auth_type', 'auth_key', 'description', 'ip_addresses', 'interface_count',
'pk', 'group_id', 'protocol', 'auth_type', 'auth_key', 'description', 'ip_addresses', 'member_count',
'tags', 'created', 'last_updated',
)
default_columns = ('pk', 'group_id', 'protocol', 'auth_type', 'description', 'ip_addresses', 'interface_count')
default_columns = ('pk', 'group_id', 'protocol', 'auth_type', 'description', 'ip_addresses', 'member_count')
class FHRPGroupAssignmentTable(NetBoxTable):

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

@@ -112,6 +112,10 @@ class ASNTable(NetBoxTable):
site_count = columns.LinkedCountColumn(
viewname='dcim:site_list',
url_params={'asn_id': 'pk'},
verbose_name='Site Count'
)
sites = tables.ManyToManyColumn(
linkify_item=True,
verbose_name='Sites'
)
tenant = TenantColumn()
@@ -122,8 +126,8 @@ class ASNTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = ASN
fields = (
'pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'tenant', 'description', 'created', 'last_updated',
'actions',
'pk', 'asn', 'asn_asdot', 'rir', 'site_count', 'tenant', 'description', 'sites', 'tags', 'created',
'last_updated', 'actions',
)
default_columns = ('pk', 'asn', 'rir', 'site_count', 'sites', 'description', 'tenant')