From 754ff4a599c67e1a52f719bdb5ac4ad6261b8be3 Mon Sep 17 00:00:00 2001 From: Josh VanDeraa Date: Mon, 13 Jul 2020 08:36:15 -0500 Subject: [PATCH] Moves location of the IP address / hostname check and assignment --- netbox/dcim/api/views.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/netbox/dcim/api/views.py b/netbox/dcim/api/views.py index 007217e44..2aff33840 100644 --- a/netbox/dcim/api/views.py +++ b/netbox/dcim/api/views.py @@ -379,6 +379,22 @@ class DeviceViewSet(CustomFieldModelViewSet): device.platform )) + # Check for primary IP address from NetBox object + if device.primary_ip: + host = str(device.primary_ip.address.ip) + else: + # Raise exception for no IP address and no Name if device.name does not exist + if not device.name: + raise ServiceUnavailable( + "This device does not have a primary IP address or device name to lookup configured.") + try: + # Attempt to complete a DNS name resolution if no primary_ip is set + host = socket.gethostbyname(device.name) + except socket.gaierror: + # Name lookup failure + raise ServiceUnavailable( + f"Name lookup failure, unable to resolve IP address for {device.name}. Please set Primary IP or setup name resolution.") + # Check that NAPALM is installed try: import napalm @@ -398,20 +414,6 @@ class DeviceViewSet(CustomFieldModelViewSet): if not request.user.has_perm('dcim.napalm_read'): return HttpResponseForbidden() - # Check for primary IP address from NetBox object - if device.primary_ip: - host = str(device.primary_ip.address.ip) - else: - # Raise exception for no IP address and no Name if device.name does not exist - if not device.name: - raise ServiceUnavailable("This device does not have a primary IP address or device name to lookup configured.") - try: - # Attempt to complete a DNS name resolution if no primary_ip is set - host = socket.gethostbyname(device.name) - except socket.gaierror: - # Name lookup failure - raise ServiceUnavailable(f"Name lookup failure, unable to resolve IP address for {device.name}. Please set Primary IP or setup name resolution.") - napalm_methods = request.GET.getlist('method') response = OrderedDict([(m, None) for m in napalm_methods]) username = settings.NAPALM_USERNAME