From 7a3adca7715554f0711c0dc7aaee7dd147af627d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 11 Sep 2017 15:51:03 -0400 Subject: [PATCH] Added device count to clusters table --- netbox/virtualization/tables.py | 3 ++- netbox/virtualization/views.py | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py index 04db8c04c..59f3f5393 100644 --- a/netbox/virtualization/tables.py +++ b/netbox/virtualization/tables.py @@ -64,11 +64,12 @@ class ClusterGroupTable(BaseTable): class ClusterTable(BaseTable): pk = ToggleColumn() name = tables.LinkColumn() + device_count = tables.Column(verbose_name='Devices') vm_count = tables.Column(verbose_name='VMs') class Meta(BaseTable.Meta): model = Cluster - fields = ('pk', 'name', 'type', 'group', 'vm_count') + fields = ('pk', 'name', 'type', 'group', 'device_count', 'vm_count') # diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 29a35f44b..f7b626589 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -87,7 +87,10 @@ class ClusterGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): # class ClusterListView(ObjectListView): - queryset = Cluster.objects.annotate(vm_count=Count('virtual_machines')) + queryset = Cluster.objects.annotate( + device_count=Count('devices', distinct=True), + vm_count=Count('virtual_machines', distinct=True) + ) table = tables.ClusterTable filter = filters.ClusterFilter filter_form = forms.ClusterFilterForm