From 602f5e4db0d9d0583bd0d6b64fbd46663b00b317 Mon Sep 17 00:00:00 2001 From: Abhimanyu Saharan Date: Fri, 5 May 2023 01:53:34 +0530 Subject: [PATCH] changes as per review --- netbox/dcim/svg/racks.py | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/netbox/dcim/svg/racks.py b/netbox/dcim/svg/racks.py index 5790b8d68..5f3c34d4f 100644 --- a/netbox/dcim/svg/racks.py +++ b/netbox/dcim/svg/racks.py @@ -37,16 +37,25 @@ def get_device_name(device): def get_device_description(device): - return '{} ({}) {} — {} {} ({}U) {} {}'.format( - device.name, - device.device_role, - device.description, - device.device_type.manufacturer.name, - device.device_type.model, - floatformat(device.device_type.u_height), - device.asset_tag or '', - device.serial or '' - ) + """ + Return a description for a device to be rendered in the rack elevation in the following format + + Name: Device Name + Role: Device Role + Description: Device Description + Device Type: Device Type Manufacturer Device Type Model (Device Type U Height) (Device Asset Tag) (Device Serial) + """ + description = f'Name: {device.name}' + description += f'\nRole: {device.device_role}' + if device.description: + description += f'\nDescription: {device.description}' + description += f'\nDevice Type: {device.device_type.manufacturer.name} {device.device_type.model} ({floatformat(device.device_type.u_height)})' + if device.asset_tag: + description += f' {device.asset_tag}' + if device.serial: + description += f' {device.serial}' + + return description class RackElevationSVG: