Merge pull request #177 from nautobot/develop

Release v2.1.1

.github/workflows/ci.yml

@@ -10,11 +10,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
-        nautobot-version: ["2.0"]
-        exclude:
-          - python-version: 3.10
-            nautobot-version: 1.2
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        nautobot-version: ["2.0", "2.1", "stable"]
     env:
       PYTHON_VER: "${{ matrix.python-version }}"
       NAUTOBOT_VER: "${{ matrix.nautobot-version }}"

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.1.1
+
+- (#173) Fixes for authentication change in Nautobot.
+
 ## v2.1.0
 
 ### New Features
@@ -41,6 +45,10 @@ New release for nautobot 2.0
 Release Candidate. 
 New release train for nautobot 2.X
 
+## v1.5.2
+
+- (#174) Fixes for authentication change in Nautobot.
+
 ## v1.5.0
 
 ### New Features

pynautobot/core/api.py

@@ -15,6 +15,7 @@
 
 This file has been modified by NetworktoCode, LLC.
 """
+
 from packaging import version
 import requests
 from requests.adapters import HTTPAdapter
@@ -140,10 +141,12 @@ def version(self):
         '1.0'
         >>>
         """
-        version = Request(
-            base=self.base_url, http_session=self.http_session, api_version=self.api_version
+        return Request(
+            base=self.base_url,
+            http_session=self.http_session,
+            api_version=self.api_version,
+            token=self.token,
         ).get_version()
-        return version
 
     def openapi(self):
         """Returns the OpenAPI spec.
@@ -166,6 +169,7 @@ def openapi(self):
             base=self.base_url,
             http_session=self.http_session,
             api_version=self.api_version,
+            token=self.token,
         ).get_openapi()
 
     def status(self):
@@ -196,10 +200,9 @@ def status(self):
          'rq-workers-running': 1}
         >>>
         """
-        status = Request(
+        return Request(
             base=self.base_url,
             token=self.token,
             http_session=self.http_session,
             api_version=self.api_version,
         ).get_status()
-        return status

pynautobot/core/query.py

@@ -15,6 +15,7 @@
 
 This file has been modified by NetworktoCode, LLC.
 """
+
 try:
     import concurrent.futures as cf
 except ImportError:
@@ -162,6 +163,7 @@ def get_openapi(self):
         """Gets the OpenAPI Spec"""
         headers = {
             "Content-Type": "application/json;",
+            "Authorization": f"Token {self.token}",
         }
 
         if self.api_version:
@@ -190,7 +192,10 @@ def get_version(self):
         :Returns: Version number as a string. Empty string if version is not
         present in the headers.
         """
-        headers = {"Content-Type": "application/json;"}
+        headers = {
+            "Content-Type": "application/json;",
+            "Authorization": f"Token {self.token}",
+        }
         if self.api_version:
             headers["accept"] = f"application/json; version={self.api_version}"
 
@@ -213,7 +218,10 @@ def get_status(self):
         :Returns: Dictionary as returned by Nautobot.
         :Raises: RequestError if request is not successful.
         """
-        headers = {"Content-Type": "application/json;"}
+        headers = {
+            "Content-Type": "application/json;",
+            "Authorization": f"Token {self.token}",
+        }
         if self.token:
             headers["authorization"] = "Token {}".format(self.token)
 

pyproject.toml

@@ -2,7 +2,7 @@
 
 [tool.poetry]
 name = "pynautobot"
-version = "2.1.0"
+version = "2.1.1"
 description = "Nautobot API client library"
 authors = ["Network to Code, LLC <[email protected]>"]
 readme = "README.md"
@@ -62,7 +62,7 @@ exclude = '''
     | dist
   )/
   | settings.py     # This is where you define files that should not be stylized by black
-                     # the root of the project
+  | .devicetype-library/
 )
 '''
 

tests/unit/test_request.py

@@ -6,9 +6,9 @@
 
 class RequestTestCase(unittest.TestCase):
     def test_get_openapi(self):
-        test = Request("http://localhost:8080/api", Mock())
+        test = Request("http://localhost:8080/api", Mock(), token="1234")
         test.get_openapi()
         test.http_session.get.assert_called_with(
             "http://localhost:8080/api/docs/?format=openapi",
-            headers={"Content-Type": "application/json;"},
+            headers={"Content-Type": "application/json;", "Authorization": "Token 1234"},
         )