From f8ee7d35ac92002870f34978d1445977c457e18d Mon Sep 17 00:00:00 2001 From: Michael Schwartzkopff Date: Mon, 25 Feb 2019 19:28:02 +0100 Subject: [PATCH 1/2] Suggestion to fix issue #51795 --- salt/modules/netbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/netbox.py b/salt/modules/netbox.py index 141a274b6778..019946655933 100644 --- a/salt/modules/netbox.py +++ b/salt/modules/netbox.py @@ -31,7 +31,7 @@ try: import pynetbox - from pynetbox.lib import RequestError + from pynetbox.core.query import RequestError HAS_PYNETBOX = True except ImportError: HAS_PYNETBOX = False From 2725fa1bd734f9d88d7a865c0eef41d14ecba067 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sun, 5 Jan 2020 18:31:20 +0000 Subject: [PATCH 2/2] Catch pynetbox.RequestError --- salt/modules/netbox.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/salt/modules/netbox.py b/salt/modules/netbox.py index 019946655933..ff53fb030be7 100644 --- a/salt/modules/netbox.py +++ b/salt/modules/netbox.py @@ -31,7 +31,6 @@ try: import pynetbox - from pynetbox.core.query import RequestError HAS_PYNETBOX = True except ImportError: HAS_PYNETBOX = False @@ -102,7 +101,7 @@ def _add(app, endpoint, payload): nb = _nb_obj(auth_required=True) try: return getattr(getattr(nb, app), endpoint).create(**payload) - except RequestError as e: + except pynetbox.RequestError as e: log.error("{}, {}, {}".format(e.req.request.headers, e.request_body, e.error)) return False @@ -378,7 +377,7 @@ def create_device(name, return False status = {'label': "Active", 'value': 1} - except RequestError as e: + except pynetbox.RequestError as e: log.error("{}, {}, {}".format(e.req.request.headers, e.request_body, e.error)) return False @@ -415,7 +414,7 @@ def update_device(name, **kwargs): try: nb_device.save() return {'dcim': {'devices': kwargs}} - except RequestError as e: + except pynetbox.RequestError as e: log.error("{}, {}, {}".format(e.req.request.headers, e.request_body, e.error)) return False @@ -797,7 +796,7 @@ def update_interface(device_name, interface_name, **kwargs): try: nb_interface.save() return {'dcim': {'interfaces': {nb_interface.id: dict(nb_interface)}}} - except RequestError as e: + except pynetbox.RequestError as e: log.error("{}, {}, {}".format(e.req.request.headers, e.request_body, e.error)) return False