From 1ecf4853b850b76d5eb4df5aa0b1d39128c2782f Mon Sep 17 00:00:00 2001 From: ibeljakov Date: Mon, 11 May 2020 16:46:10 +0300 Subject: [PATCH] Fixed devices.py.example report --- reports/devices.py.example | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/reports/devices.py.example b/reports/devices.py.example index 2dee036..670eeb6 100644 --- a/reports/devices.py.example +++ b/reports/devices.py.example @@ -1,4 +1,4 @@ -from dcim.constants import CONNECTION_STATUS_PLANNED, DEVICE_STATUS_ACTIVE +from dcim.choices import DeviceStatusChoices from dcim.models import ConsolePort, Device, PowerPort from extras.reports import Report @@ -9,13 +9,14 @@ class DeviceConnectionsReport(Report): def test_console_connection(self): # Check that every console port for every active device has a connection defined. - for console_port in ConsolePort.objects.select_related('device').filter(device__status=DEVICE_STATUS_ACTIVE): + active = DeviceStatusChoices.STATUS_ACTIVE + for console_port in ConsolePort.objects.prefetch_related('device').filter(device__status=active): if console_port.connected_endpoint is None: self.log_failure( console_port.device, "No console connection defined for {}".format(console_port.name) ) - elif console_port.connection_status == CONNECTION_STATUS_PLANNED: + elif not console_port.connection_status: self.log_warning( console_port.device, "Console connection for {} marked as planned".format(console_port.name) @@ -26,12 +27,12 @@ class DeviceConnectionsReport(Report): def test_power_connections(self): # Check that every active device has at least two connected power supplies. - for device in Device.objects.filter(status=DEVICE_STATUS_ACTIVE): + for device in Device.objects.filter(status=DeviceStatusChoices.STATUS_ACTIVE): connected_ports = 0 for power_port in PowerPort.objects.filter(device=device): if power_port.connected_endpoint is not None: connected_ports += 1 - if power_port.connection_status == CONNECTION_STATUS_PLANNED: + if not power_port.connection_status: self.log_warning( device, "Power connection for {} marked as planned".format(power_port.name) @@ -43,4 +44,3 @@ class DeviceConnectionsReport(Report): ) else: self.log_success(device) -