Address some of the django_tables2 deprecation warnings

netbox/circuits/tables.py

@@ -62,7 +62,7 @@ class CircuitTable(BaseTable):
     )
     provider = tables.LinkColumn(
         viewname='circuits:provider',
-        args=[Accessor('provider.slug')]
+        args=[Accessor('provider__slug')]
     )
     status = tables.TemplateColumn(
         template_code=STATUS_LABEL

netbox/dcim/tables.py

@@ -187,7 +187,7 @@ class RackGroupTable(BaseTable):
     )
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')],
+        args=[Accessor('site__slug')],
         verbose_name='Site'
     )
     rack_count = tables.Column(
@@ -231,7 +231,7 @@ class RackTable(BaseTable):
     )
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
@@ -290,22 +290,19 @@ class RackDetailTable(RackTable):
 
 class RackReservationTable(BaseTable):
     pk = ToggleColumn()
-    reservation = tables.LinkColumn(
+    reservation = tables.Column(
-        viewname='dcim:rackreservation',
+        accessor='pk',
-        args=[Accessor('pk')],
+        linkify=True
-        accessor='pk'
     )
-    site = tables.LinkColumn(
+    site = tables.Column(
-        viewname='dcim:site',
+        accessor=Accessor('rack__site'),
-        accessor=Accessor('rack.site'),
+        linkify=True
-        args=[Accessor('rack.site.slug')],
     )
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
     )
-    rack = tables.LinkColumn(
+    rack = tables.Column(
-        viewname='dcim:rack',
+        linkify=True
-        args=[Accessor('rack.pk')]
     )
     unit_list = tables.Column(
         orderable=False,
@@ -359,9 +356,8 @@ class ManufacturerTable(BaseTable):
 
 class DeviceTypeTable(BaseTable):
     pk = ToggleColumn()
-    model = tables.LinkColumn(
+    model = tables.Column(
-        viewname='dcim:devicetype',
+        linkify=True,
-        args=[Accessor('pk')],
         verbose_name='Device Type'
     )
     is_full_depth = BooleanColumn(
@@ -577,20 +573,18 @@ class DeviceTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
     )
-    site = tables.LinkColumn(
+    site = tables.Column(
-        viewname='dcim:site',
+        linkify=True
-        args=[Accessor('site.slug')]
     )
-    rack = tables.LinkColumn(
+    rack = tables.Column(
-        viewname='dcim:rack',
+        linkify=True
-        args=[Accessor('rack.pk')]
     )
     device_role = ColoredLabelColumn(
         verbose_name='Role'
     )
     device_type = tables.LinkColumn(
         viewname='dcim:devicetype',
-        args=[Accessor('device_type.pk')],
+        args=[Accessor('device_type__pk')],
         verbose_name='Type',
         text=lambda record: record.device_type.display_name
     )
@@ -599,23 +593,21 @@ class DeviceTable(BaseTable):
         orderable=False,
         verbose_name='IP Address'
     )
-    primary_ip4 = tables.LinkColumn(
+    primary_ip4 = tables.Column(
-        viewname='ipam:ipaddress',
+        linkify=True,
-        args=[Accessor('primary_ip4.pk')],
         verbose_name='IPv4 Address'
     )
-    primary_ip6 = tables.LinkColumn(
+    primary_ip6 = tables.Column(
-        viewname='ipam:ipaddress',
+        linkify=True,
-        args=[Accessor('primary_ip6.pk')],
         verbose_name='IPv6 Address'
     )
     cluster = tables.LinkColumn(
         viewname='virtualization:cluster',
-        args=[Accessor('cluster.pk')]
+        args=[Accessor('cluster__pk')]
     )
     virtual_chassis = tables.LinkColumn(
         viewname='dcim:virtualchassis',
-        args=[Accessor('virtual_chassis.pk')]
+        args=[Accessor('virtual_chassis__pk')]
     )
     vc_position = tables.Column(
         verbose_name='VC Position'
@@ -649,13 +641,11 @@ class DeviceImportTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
     )
-    site = tables.LinkColumn(
+    site = tables.Column(
-        viewname='dcim:site',
+        linkify=True
-        args=[Accessor('site.slug')]
     )
-    rack = tables.LinkColumn(
+    rack = tables.Column(
-        viewname='dcim:rack',
+        linkify=True
-        args=[Accessor('rack.pk')]
     )
     device_role = tables.Column(
         verbose_name='Role'
@@ -800,9 +790,8 @@ class InventoryItemTable(DeviceComponentTable):
 
 class CableTable(BaseTable):
     pk = ToggleColumn()
-    id = tables.LinkColumn(
+    id = tables.Column(
-        viewname='dcim:cable',
+        linkify=True,
-        args=[Accessor('pk')],
         verbose_name='ID'
     )
     termination_a_parent = tables.TemplateColumn(
@@ -858,20 +847,20 @@ class CableTable(BaseTable):
 class ConsoleConnectionTable(BaseTable):
     console_server = tables.LinkColumn(
         viewname='dcim:device',
-        accessor=Accessor('connected_endpoint.device'),
+        accessor=Accessor('connected_endpoint__device'),
-        args=[Accessor('connected_endpoint.device.pk')],
+        args=[Accessor('connected_endpoint__device__pk')],
         verbose_name='Console Server'
     )
     connected_endpoint = tables.Column(
         verbose_name='Port'
     )
-    device = tables.LinkColumn(
+    device = tables.Column(
-        viewname='dcim:device',
+        linkify=True
-        args=[Accessor('device.pk')]
     )
     name = tables.Column(
         verbose_name='Console Port'
     )
+    connection_status = BooleanColumn()
 
     class Meta(BaseTable.Meta):
         model = ConsolePort
@@ -881,8 +870,8 @@ class ConsoleConnectionTable(BaseTable):
 class PowerConnectionTable(BaseTable):
     pdu = tables.LinkColumn(
         viewname='dcim:device',
-        accessor=Accessor('connected_endpoint.device'),
+        accessor=Accessor('connected_endpoint__device'),
-        args=[Accessor('connected_endpoint.device.pk')],
+        args=[Accessor('connected_endpoint__device__pk')],
         order_by='_connected_poweroutlet__device',
         verbose_name='PDU'
     )
@@ -890,9 +879,8 @@ class PowerConnectionTable(BaseTable):
         accessor=Accessor('_connected_poweroutlet'),
         verbose_name='Outlet'
     )
-    device = tables.LinkColumn(
+    device = tables.Column(
-        viewname='dcim:device',
+        linkify=True
-        args=[Accessor('device.pk')]
     )
     name = tables.Column(
         verbose_name='Power Port'
@@ -907,7 +895,7 @@ class InterfaceConnectionTable(BaseTable):
     device_a = tables.LinkColumn(
         viewname='dcim:device',
         accessor=Accessor('device'),
-        args=[Accessor('device.pk')],
+        args=[Accessor('device__pk')],
         verbose_name='Device A'
     )
     interface_a = tables.LinkColumn(
@@ -918,14 +906,14 @@ class InterfaceConnectionTable(BaseTable):
     )
     device_b = tables.LinkColumn(
         viewname='dcim:device',
-        accessor=Accessor('_connected_interface.device'),
+        accessor=Accessor('_connected_interface__device'),
-        args=[Accessor('_connected_interface.device.pk')],
+        args=[Accessor('_connected_interface__device__pk')],
         verbose_name='Device B'
     )
     interface_b = tables.LinkColumn(
         viewname='dcim:interface',
         accessor=Accessor('_connected_interface'),
-        args=[Accessor('_connected_interface.pk')],
+        args=[Accessor('_connected_interface__pk')],
         verbose_name='Interface B'
     )
 
@@ -970,7 +958,7 @@ class PowerPanelTable(BaseTable):
     name = tables.LinkColumn()
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     powerfeed_count = tables.TemplateColumn(
         template_code=POWERPANEL_POWERFEED_COUNT,
@@ -993,13 +981,11 @@ class PowerPanelTable(BaseTable):
 class PowerFeedTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
-    power_panel = tables.LinkColumn(
+    power_panel = tables.Column(
-        viewname='dcim:powerpanel',
+        linkify=True
-        args=[Accessor('power_panel.pk')],
     )
-    rack = tables.LinkColumn(
+    rack = tables.Column(
-        viewname='dcim:rack',
+        linkify=True
-        args=[Accessor('rack.pk')]
     )
     status = tables.TemplateColumn(
         template_code=STATUS_LABEL

netbox/extras/tables.py

@@ -1,5 +1,4 @@
 import django_tables2 as tables
-from django_tables2.utils import Accessor
 
 from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColorColumn, ToggleColumn
 from .models import ConfigContext, ObjectChange, Tag, TaggedItem

netbox/ipam/tables.py

@@ -322,13 +322,11 @@ class PrefixTable(BaseTable):
     tenant = tables.TemplateColumn(
         template_code=TENANT_LINK
     )
-    site = tables.LinkColumn(
+    site = tables.Column(
-        viewname='dcim:site',
+        linkify=True
-        args=[Accessor('site.slug')]
     )
-    vlan = tables.LinkColumn(
+    vlan = tables.Column(
-        viewname='ipam:vlan',
+        linkify=True,
-        args=[Accessor('vlan.pk')],
         verbose_name='VLAN'
     )
     role = tables.TemplateColumn(
@@ -392,7 +390,8 @@ class IPAddressTable(BaseTable):
         template_code=TENANT_LINK
     )
     assigned = tables.BooleanColumn(
-        accessor='assigned_object_id'
+        accessor='assigned_object_id',
+        verbose_name='Assigned'
     )
 
     class Meta(BaseTable.Meta):
@@ -406,9 +405,8 @@ class IPAddressTable(BaseTable):
 
 
 class IPAddressDetailTable(IPAddressTable):
-    nat_inside = tables.LinkColumn(
+    nat_inside = tables.Column(
-        viewname='ipam:ipaddress',
+        linkify=True,
-        args=[Accessor('nat_inside.pk')],
         orderable=False,
         verbose_name='NAT (Inside)'
     )
@@ -479,7 +477,7 @@ class VLANGroupTable(BaseTable):
     name = tables.LinkColumn()
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     vlan_count = tables.Column(
         verbose_name='VLANs'
@@ -507,11 +505,11 @@ class VLANTable(BaseTable):
     )
     site = tables.LinkColumn(
         viewname='dcim:site',
-        args=[Accessor('site.slug')]
+        args=[Accessor('site__slug')]
     )
     group = tables.LinkColumn(
         viewname='ipam:vlangroup_vlans',
-        args=[Accessor('group.pk')]
+        args=[Accessor('group__pk')]
     )
     tenant = tables.TemplateColumn(
         template_code=COL_TENANT
@@ -581,12 +579,11 @@ class InterfaceVLANTable(BaseTable):
         verbose_name='ID'
     )
     tagged = BooleanColumn()
-    site = tables.LinkColumn(
+    site = tables.Column(
-        viewname='dcim:site',
+        linkify=True
-        args=[Accessor('site.slug')]
     )
     group = tables.Column(
-        accessor=Accessor('group.name'),
+        accessor=Accessor('group__name'),
         verbose_name='Group'
     )
     tenant = tables.TemplateColumn(
@@ -614,9 +611,8 @@ class InterfaceVLANTable(BaseTable):
 
 class ServiceTable(BaseTable):
     pk = ToggleColumn()
-    name = tables.LinkColumn(
+    name = tables.Column(
-        viewname='ipam:service',
+        linkify=True
-        args=[Accessor('pk')]
     )
     parent = tables.LinkColumn(
         order_by=('device', 'virtual_machine')

netbox/virtualization/tables.py

@@ -3,7 +3,7 @@ from django_tables2.utils import Accessor
 
 from dcim.tables import BaseInterfaceTable
 from tenancy.tables import COL_TENANT
-from utilities.tables import BaseTable, BooleanColumn, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
+from utilities.tables import BaseTable, ButtonsColumn, ColoredLabelColumn, TagColumn, ToggleColumn
 from .models import Cluster, ClusterGroup, ClusterType, VirtualMachine, VMInterface
 
 VIRTUALMACHINE_STATUS = """
@@ -60,13 +60,11 @@ class ClusterGroupTable(BaseTable):
 class ClusterTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
-    tenant = tables.LinkColumn(
+    tenant = tables.Column(
-        viewname='tenancy:tenant',
+        linkify=True
-        args=[Accessor('tenant.slug')]
     )
-    site = tables.LinkColumn(
+    site = tables.Column(
-        viewname='dcim:site',
+        linkify=True
-        args=[Accessor('site.slug')]
     )
     device_count = tables.Column(
         accessor=Accessor('devices.count'),
@@ -98,9 +96,8 @@ class VirtualMachineTable(BaseTable):
     status = tables.TemplateColumn(
         template_code=VIRTUALMACHINE_STATUS
     )
-    cluster = tables.LinkColumn(
+    cluster = tables.Column(
-        viewname='virtualization:cluster',
+        linkify=True
-        args=[Accessor('cluster.pk')]
     )
     role = ColoredLabelColumn()
     tenant = tables.TemplateColumn(
@@ -113,14 +110,12 @@ class VirtualMachineTable(BaseTable):
 
 
 class VirtualMachineDetailTable(VirtualMachineTable):
-    primary_ip4 = tables.LinkColumn(
+    primary_ip4 = tables.Column(
-        viewname='ipam:ipaddress',
+        linkify=True,
-        args=[Accessor('primary_ip4.pk')],
         verbose_name='IPv4 Address'
     )
-    primary_ip6 = tables.LinkColumn(
+    primary_ip6 = tables.Column(
-        viewname='ipam:ipaddress',
+        linkify=True,
-        args=[Accessor('primary_ip6.pk')],
         verbose_name='IPv6 Address'
     )
     primary_ip = tables.TemplateColumn(