From 4292d88a9230789ef0c5af627e7245d2d3dd4bda Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 22 Jun 2021 14:21:41 -0400 Subject: [PATCH] Closes #6620: Show assigned VMs count under device role view --- docs/release-notes/version-2.11.md | 4 ++++ netbox/dcim/views.py | 2 ++ netbox/templates/dcim/devicerole.html | 12 +++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md index f03271c3b..e1840319e 100644 --- a/docs/release-notes/version-2.11.md +++ b/docs/release-notes/version-2.11.md @@ -2,6 +2,10 @@ ## v2.11.8 (FUTURE) +### Enhancements + +* [#6620](https://github.com/netbox-community/netbox/issues/6620) - Show assigned VMs count under device role view + ### Bug Fixes * [#6626](https://github.com/netbox-community/netbox/issues/6626) - Fix site field on VM search form; add site group diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 4ed80d6c8..50b55ee3f 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -1169,6 +1169,8 @@ class DeviceRoleView(generic.ObjectView): return { 'devices_table': devices_table, + 'device_count': Device.objects.filter(device_role=instance).count(), + 'virtualmachine_count': VirtualMachine.objects.filter(role=instance).count(), } diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html index c6cbf4952..664bb00c6 100644 --- a/netbox/templates/dcim/devicerole.html +++ b/netbox/templates/dcim/devicerole.html @@ -42,7 +42,17 @@ Devices - {{ devices_table.rows|length }} + {{ device_count }} + + + + Virtual Machines + + {% if object.vm_role %} + {{ virtualmachine_count }} + {% else %} + — + {% endif %}