Browse Source

Added device count to clusters table

Jeremy Stretch 7 years ago
parent
commit
7a3adca771
2 changed files with 6 additions and 2 deletions
  1. 2 1
      netbox/virtualization/tables.py
  2. 4 1
      netbox/virtualization/views.py

+ 2 - 1
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')
 
 
 #

+ 4 - 1
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