Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/1433-add-custom-headers.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
minor_changes:
- Add support for custom headers for all modules
3 changes: 2 additions & 1 deletion docs/getting_started/contributing/modules/architecture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,11 @@ We set several instance attributes that are used within other methods throughout
url = self.module.params["netbox_url"]
token = self.module.params["netbox_token"]
ssl_verify = self.module.params["validate_certs"]
headers = self.module.params["headers"]

# Attempt to initiate connection to NetBox
if nb_client is None:
self.nb = self._connect_netbox_api(url, token, ssl_verify)
self.nb = self._connect_netbox_api(url, token, ssl_verify, headers)
else:
self.nb = nb_client
try:
Expand Down
4 changes: 4 additions & 0 deletions plugins/doc_fragments/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,8 @@ class ModuleDocFragment(object):
- Certificate path
required: false
type: raw
headers:
description: Dictionary of headers to be passed to the NetBox API.
required: false
type: dict
"""
10 changes: 8 additions & 2 deletions plugins/module_utils/netbox_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@
query_params=dict(required=False, type="list", elements="str"),
validate_certs=dict(type="raw", default=True),
cert=dict(type="raw", required=False),
headers=dict(type="dict", required=False),
)


Expand Down Expand Up @@ -751,10 +752,11 @@ def __init__(self, module, endpoint, nb_client=None):
token = self.module.params["netbox_token"]
ssl_verify = self.module.params["validate_certs"]
cert = self.module.params["cert"]
headers = self.module.params["headers"]

# Attempt to initiate connection to NetBox
if nb_client is None:
self.nb = self._connect_netbox_api(url, token, ssl_verify, cert)
self.nb = self._connect_netbox_api(url, token, ssl_verify, cert, headers)
else:
self.nb = nb_client
try:
Expand Down Expand Up @@ -804,10 +806,14 @@ def _version_check_greater(self, greater, lesser, greater_or_equal=False):

return False

def _connect_netbox_api(self, url, token, ssl_verify, cert):
def _connect_netbox_api(self, url, token, ssl_verify, cert, headers=None):
try:
session = requests.Session()
session.verify = ssl_verify
if isinstance(headers, str):
headers = json.load(headers)
if isinstance(headers, dict):
session.headers.update(headers)
if cert:
session.cert = tuple(i for i in cert)
nb = pynetbox.api(url, token=token)
Expand Down
1 change: 1 addition & 0 deletions tests/unit/module_utils/test_netbox_base_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def fixture_arg_spec():
"state": "present",
"validate_certs": False,
"cert": None,
"headers": None,
}


Expand Down
Loading